]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge from Mainline
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 7 Mar 2013 13:03:30 +0000 (13:03 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 7 Mar 2013 13:03:30 +0000 (13:03 +0000)
Conflicts:
deal.II/common/Make.rules
deal.II/contrib/hsl/Makefile
deal.II/contrib/utilities/Makefile.in
deal.II/doc/development/Makefile.small
deal.II/doc/doxygen/tutorial/Makefile
deal.II/examples/doxygen/Makefile
deal.II/examples/step-1/Makefile
deal.II/examples/step-10/Makefile
deal.II/examples/step-11/Makefile
deal.II/examples/step-12/Makefile
deal.II/examples/step-13/Makefile
deal.II/examples/step-14/Makefile
deal.II/examples/step-15/Makefile
deal.II/examples/step-16/Makefile
deal.II/examples/step-17/Makefile
deal.II/examples/step-18/Makefile
deal.II/examples/step-19/Makefile
deal.II/examples/step-2/Makefile
deal.II/examples/step-20/Makefile
deal.II/examples/step-21/Makefile
deal.II/examples/step-22/Makefile
deal.II/examples/step-23/Makefile
deal.II/examples/step-24/Makefile
deal.II/examples/step-25/Makefile
deal.II/examples/step-26/Makefile
deal.II/examples/step-27/Makefile
deal.II/examples/step-28/Makefile
deal.II/examples/step-29/Makefile
deal.II/examples/step-3/Makefile
deal.II/examples/step-30/Makefile
deal.II/examples/step-31/Makefile
deal.II/examples/step-32/Makefile
deal.II/examples/step-33/Makefile
deal.II/examples/step-34/Makefile
deal.II/examples/step-35/Makefile
deal.II/examples/step-36/Makefile
deal.II/examples/step-37/Makefile
deal.II/examples/step-38/Makefile
deal.II/examples/step-39/Makefile
deal.II/examples/step-4/Makefile
deal.II/examples/step-40/Makefile
deal.II/examples/step-41/Makefile
deal.II/examples/step-42/Makefile
deal.II/examples/step-43/Makefile
deal.II/examples/step-44/Makefile
deal.II/examples/step-45/Makefile
deal.II/examples/step-46/Makefile
deal.II/examples/step-47/Makefile
deal.II/examples/step-48/Makefile
deal.II/examples/step-49/Makefile
deal.II/examples/step-5/Makefile
deal.II/examples/step-50/Makefile
deal.II/examples/step-6/Makefile
deal.II/examples/step-7/Makefile
deal.II/examples/step-8/Makefile
deal.II/examples/step-9/Makefile
deal.II/source/Makefile
deal.II/source/dofs/dof_handler_policy.cc

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28787 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/examples/step-21/step-21.cc
deal.II/examples/step-37/step-37.cc
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/grid/tria.cc
tests/Makefile
tests/all-headers/Makefile
tests/base/Makefile
tests/mesh_converter/Makefile

Simple merge
Simple merge
index 70050665a6e1974cc67ea348eae6032789110827,5272fba1d7916911d8607ca50e349241d0553319..750caaebf9c4dd118d70c2aad0ae562d6a8ae1bb
@@@ -1669,8 -1674,12 +1674,12 @@@ namespace interna
           const std::vector<unsigned int> &p4est_tree_to_coarse_cell_permutation,
           const unsigned int level)
          {
 -#ifndef DEAL_II_USE_P4EST
 +#ifndef DEAL_II_WITH_P4EST
+           (void)dof_handler;
            (void)vertices_with_ghost_neighbors;
+           (void)coarse_cell_to_p4est_tree_permutation;
+           (void)p4est_tree_to_coarse_cell_permutation;
+           (void)level;
            Assert (false, ExcNotImplemented());
  #else
  
Simple merge
diff --cc tests/Makefile
Simple merge
Simple merge
Simple merge
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.