Fix header includes in meshworker

git-svn-id: https://svn.dealii.org/trunk@24247 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/meshworker/local_results.h b/deal.II/include/deal.II/meshworker/local_results.h
index 0884a19f0d655bb145fb4853179ac4f402e70282..60831927f4759e4c7d6bf352aa8a63d51bba80c3 100644 (file)
--- a/deal.II/include/deal.II/meshworker/local_results.h
+++ b/deal.II/include/deal.II/meshworker/local_results.h
@@ -18,7 +18,7 @@
 #include <deal.II/base/geometry_info.h>
 #include <deal.II/lac/matrix_block.h>
 #include <deal.II/lac/block_vector.h>
-#include <deal.II/numerics/mesh_worker_vector_selector.h>
+#include <deal.II/meshworker/vector_selector.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/meshworker/vector_selector.templates.h b/deal.II/include/deal.II/meshworker/vector_selector.templates.h
index b2d3fd896e4c04e12991cb7d6cb2ed42bf21958f..a439a8a0d52491d2c48f476e5351b210c1c54d2d 100644 (file)
--- a/deal.II/include/deal.II/meshworker/vector_selector.templates.h
+++ b/deal.II/include/deal.II/meshworker/vector_selector.templates.h
@@ -10,7 +10,7 @@
 //
 //---------------------------------------------------------------------------
 
-#include <deal.II/numerics/mesh_worker_vector_selector.h>
+#include <deal.II/meshworker/vector_selector.h>
 #include <deal.II/base/vector_slice.h>
 #include <deal.II/fe/fe_values.h>
 

diff --git a/deal.II/include/deal.II/numerics/mesh_worker_info.h b/deal.II/include/deal.II/numerics/mesh_worker_info.h
index 0a14ef3dcbc67263345247f937e02dece215251a..3a8f6d43db2960f3edb72641e115328f0f691a62 100644 (file)
--- a/deal.II/include/deal.II/numerics/mesh_worker_info.h
+++ b/deal.II/include/deal.II/numerics/mesh_worker_info.h
@@ -18,8 +18,9 @@
 #include <deal.II/base/std_cxx1x/shared_ptr.h>
 #include <deal.II/dofs/block_info.h>
 #include <deal.II/fe/fe_values.h>
-#include <deal.II/numerics/mesh_worker.h>
-#include <deal.II/numerics/mesh_worker_vector_selector.h>
+//#include <deal.II/numerics/mesh_worker.h>
+#include <deal.II/meshworker/local_results.h>
+#include <deal.II/meshworker/vector_selector.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/source/numerics/mesh_worker.cc b/deal.II/source/numerics/mesh_worker.cc
index 9b134940d68a0c9bf96b3178b97a6e5bc8bdede8..a973dda860c387762bb9cebc1842dcd775ef5292 100644 (file)
--- a/deal.II/source/numerics/mesh_worker.cc
+++ b/deal.II/source/numerics/mesh_worker.cc
@@ -10,7 +10,7 @@
 //
 //---------------------------------------------------------------------------
 
-#include <deal.II/numerics/mesh_worker.h>
+#include <deal.II/meshworker/local_results.h>
 #include <deal.II/lac/block_indices.h>
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/deal.II/source/numerics/mesh_worker_vector_selector.cc b/deal.II/source/numerics/mesh_worker_vector_selector.cc
index da67cf52a34e12d944e750770e6fb91508c62f89..fba82bb5132d1b0518514239f334862cf55d2c1d 100644 (file)
--- a/deal.II/source/numerics/mesh_worker_vector_selector.cc
+++ b/deal.II/source/numerics/mesh_worker_vector_selector.cc
@@ -18,7 +18,7 @@
 #include <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/trilinos_block_vector.h>
 
-#include <deal.II/numerics/mesh_worker_vector_selector.templates.h>
+#include <deal.II/meshworker/vector_selector.templates.h>
 
 DEAL_II_NAMESPACE_OPEN