From 7b5c4ed738f890ecf522d756b4773da4f33b0700 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Thu, 1 Nov 2012 02:32:09 +0000
Subject: [PATCH] Remove some old workarounds from the time when we still
 compiled every file multiple times.

git-svn-id: https://svn.dealii.org/trunk@27278 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/source/base/data_out_base.cc |  8 --------
 deal.II/source/fe/fe_q.cc            | 12 ------------
 deal.II/source/fe/fe_tools.cc        |  5 +----
 deal.II/source/grid/grid_tools.cc    | 16 ----------------
 4 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/deal.II/source/base/data_out_base.cc b/deal.II/source/base/data_out_base.cc
index 5a56f06a97..9d4a1afe05 100644
--- a/deal.II/source/base/data_out_base.cc
+++ b/deal.II/source/base/data_out_base.cc
@@ -4160,11 +4160,7 @@ void DataOutBase::write_tecplot (const std::vector<Patch<dim,spacedim> > &patche
 
 #ifdef DEAL_II_HAVE_TECPLOT
 
-#ifdef DEAL_II_ANON_NAMESPACE_BOGUS_WARNING
-namespace TEC
-#else
 namespace
-#endif
 {
   class TecplotMacros
   {
@@ -4325,11 +4321,7 @@ void DataOutBase::write_tecplot_binary (const std::vector<Patch<dim,spacedim> >
   const unsigned int vars_per_node  = (spacedim+n_data_sets),
                      nodes_per_cell = GeometryInfo<dim>::vertices_per_cell;
 
-#ifdef DEAL_II_ANON_NAMESPACE_BOGUS_WARNING
-  TEC::TecplotMacros tm(n_nodes, vars_per_node, n_cells, nodes_per_cell);
-#else
   TecplotMacros tm(n_nodes, vars_per_node, n_cells, nodes_per_cell);
-#endif
 
   int is_double = 0,
       tec_debug = 0,
diff --git a/deal.II/source/fe/fe_q.cc b/deal.II/source/fe/fe_q.cc
index 9c4270521e..a646da1fca 100644
--- a/deal.II/source/fe/fe_q.cc
+++ b/deal.II/source/fe/fe_q.cc
@@ -56,9 +56,6 @@ namespace FE_Q_Helper
                                      // given a permutation array,
                                      // compute and return the inverse
                                      // permutation
-#ifdef DEAL_II_ANON_NAMESPACE_BUG
-    static
-#endif
     inline
     std::vector<unsigned int>
     invert_numbering (const std::vector<unsigned int> &in)
@@ -77,9 +74,6 @@ namespace FE_Q_Helper
                                 // performance reasons. this clears a
                                 // dim-array
     template <int dim>
-#ifdef DEAL_II_ANON_NAMESPACE_BUG
-    static
-#endif
     inline
     void
     zero_indices (unsigned int indices[dim])
@@ -96,9 +90,6 @@ namespace FE_Q_Helper
                                 // performance reasons. this increments tensor
                                 // product indices
     template <int dim>
-#ifdef DEAL_II_ANON_NAMESPACE_BUG
-    static
-#endif
     inline
     void
     increment_indices (unsigned int       indices[dim],
@@ -123,9 +114,6 @@ namespace FE_Q_Helper
                                 // creates them from dim-dimensional support
                                 // points.
     template <int dim>
-#ifdef DEAL_II_ANON_NAMESPACE_BUG
-    static
-#endif
     inline
     std::vector<Polynomials::Polynomial<double> >
     generate_poly_space1d (const std::vector<Point<dim> >  &unit_support_points,
diff --git a/deal.II/source/fe/fe_tools.cc b/deal.II/source/fe/fe_tools.cc
index cd7d7a28f9..7c2e8d41c8 100644
--- a/deal.II/source/fe/fe_tools.cc
+++ b/deal.II/source/fe/fe_tools.cc
@@ -121,9 +121,6 @@ namespace
                                    // them. used to initialize
                                    // fe_name_map below
   template <int dim>
-#ifdef DEAL_II_ANON_NAMESPACE_BUG
-    static
-#endif
   std::map<std::string,std_cxx1x::shared_ptr<const FETools::FEFactoryBase<dim> > >
   get_default_fe_names ()
   {
@@ -1209,7 +1206,7 @@ namespace FETools
             std::vector<Point<dim> > q_points_coarse(q_points_fine.size());
             for (unsigned int q=0;q<q_points_fine.size();++q)
                 for (unsigned int j=0;j<dim;++j)
-                    q_points_coarse[q](j) = q_points_fine[q](j);            
+                    q_points_coarse[q](j) = q_points_fine[q](j);
 	    Quadrature<dim> q_coarse (q_points_coarse,
 				      fine.get_JxW_values());
 	    FEValues<dim,spacedim> coarse (mapping, fe, q_coarse, update_values);
diff --git a/deal.II/source/grid/grid_tools.cc b/deal.II/source/grid/grid_tools.cc
index 13eaa8b5bc..321023958a 100644
--- a/deal.II/source/grid/grid_tools.cc
+++ b/deal.II/source/grid/grid_tools.cc
@@ -511,11 +511,7 @@ namespace GridTools
 
 
 // define some transformations in an anonymous namespace
-#ifdef DEAL_II_ANON_NAMESPACE_BOGUS_WARNING
-  namespace TRANS
-#else
   namespace
-#endif
   {
     template <int spacedim>
     class ShiftPoint
@@ -577,11 +573,7 @@ namespace GridTools
   shift (const Point<spacedim>   &shift_vector,
          Triangulation<dim, spacedim> &triangulation)
   {
-#ifdef DEAL_II_ANON_NAMESPACE_BOGUS_WARNING
-    transform (TRANS::ShiftPoint<spacedim>(shift_vector), triangulation);
-#else
     transform (ShiftPoint<spacedim>(shift_vector), triangulation);
-#endif
   }
 
 
@@ -590,11 +582,7 @@ namespace GridTools
   rotate (const double      angle,
           Triangulation<2> &triangulation)
   {
-#ifdef DEAL_II_ANON_NAMESPACE_BOGUS_WARNING
-    transform (TRANS::Rotate2d(angle), triangulation);
-#else
     transform (Rotate2d(angle), triangulation);
-#endif
   }
 
 
@@ -605,11 +593,7 @@ namespace GridTools
          Triangulation<dim, spacedim> &triangulation)
   {
     Assert (scaling_factor>0, ExcScalingFactorNotPositive (scaling_factor));
-#ifdef DEAL_II_ANON_NAMESPACE_BOGUS_WARNING
-    transform (TRANS::ScalePoint<spacedim>(scaling_factor), triangulation);
-#else
     transform (ScalePoint<spacedim>(scaling_factor), triangulation);
-#endif
   }
 
 
-- 
2.39.5