]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix a large number of extraneous typename keywords.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 23 Jul 2002 14:16:00 +0000 (14:16 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 23 Jul 2002 14:16:00 +0000 (14:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@6266 0785d39b-7218-0410-832d-ea1e28bc413d

91 files changed:
deal.II/aclocal.m4
deal.II/base/include/base/auto_derivative_function.h
deal.II/base/include/base/data_out_base.h
deal.II/base/include/base/function.h
deal.II/base/include/base/function_derivative.h
deal.II/base/include/base/function_lib.h
deal.II/base/include/base/memory_consumption.h
deal.II/base/include/base/polynomial.h
deal.II/base/include/base/polynomial_space.h
deal.II/base/include/base/quadrature.h
deal.II/base/include/base/tensor_function.h
deal.II/base/include/base/tensor_product_polynomials.h
deal.II/base/include/base/thread_management.h
deal.II/base/source/auto_derivative_function.cc
deal.II/base/source/data_out_base.cc
deal.II/base/source/function.cc
deal.II/base/source/function_derivative.cc
deal.II/base/source/function_lib.cc
deal.II/base/source/function_lib_cutoff.cc
deal.II/base/source/legendre.cc
deal.II/base/source/polynomial.cc
deal.II/base/source/polynomial_space.cc
deal.II/base/source/quadrature.cc
deal.II/base/source/tensor_function.cc
deal.II/base/source/tensor_product_polynomials.cc
deal.II/deal.II/include/dofs/dof_handler.h
deal.II/deal.II/include/dofs/dof_tools.h
deal.II/deal.II/include/dofs/function_map.h
deal.II/deal.II/include/fe/fe_base.h
deal.II/deal.II/include/fe/fe_dgp.h
deal.II/deal.II/include/fe/fe_dgq.h
deal.II/deal.II/include/fe/fe_nedelec.h
deal.II/deal.II/include/fe/fe_q.h
deal.II/deal.II/include/fe/fe_system.h
deal.II/deal.II/include/fe/fe_values.h
deal.II/deal.II/include/fe/mapping.h
deal.II/deal.II/include/fe/mapping_c1.h
deal.II/deal.II/include/fe/mapping_cartesian.h
deal.II/deal.II/include/fe/mapping_q.h
deal.II/deal.II/include/fe/mapping_q1.h
deal.II/deal.II/include/fe/mapping_q1_eulerian.h
deal.II/deal.II/include/grid/grid_generator.h
deal.II/deal.II/include/grid/grid_in.h
deal.II/deal.II/include/grid/grid_reordering.h
deal.II/deal.II/include/grid/intergrid_map.h
deal.II/deal.II/include/grid/persistent_tria.h
deal.II/deal.II/include/grid/tria.h
deal.II/deal.II/include/grid/tria_boundary.h
deal.II/deal.II/include/grid/tria_boundary_lib.h
deal.II/deal.II/include/multigrid/mg_base.h
deal.II/deal.II/include/multigrid/mg_dof_handler.h
deal.II/deal.II/include/numerics/data_out.h
deal.II/deal.II/include/numerics/data_out_stack.h
deal.II/deal.II/include/numerics/error_estimator.h
deal.II/deal.II/include/numerics/histogram.h
deal.II/deal.II/include/numerics/matrices.h
deal.II/deal.II/include/numerics/solution_transfer.h
deal.II/deal.II/source/dofs/dof_tools.cc
deal.II/deal.II/source/fe/fe.cc
deal.II/deal.II/source/fe/fe_dgp_1d.cc
deal.II/deal.II/source/fe/fe_dgp_2d.cc
deal.II/deal.II/source/fe/fe_dgp_3d.cc
deal.II/deal.II/source/fe/fe_tools.cc
deal.II/deal.II/source/fe/fe_values.cc
deal.II/deal.II/source/fe/mapping_c1.cc
deal.II/deal.II/source/fe/mapping_cartesian.cc
deal.II/deal.II/source/fe/mapping_q.cc
deal.II/deal.II/source/fe/mapping_q1_eulerian.cc
deal.II/deal.II/source/grid/grid_generator.cc
deal.II/deal.II/source/grid/grid_in.cc
deal.II/deal.II/source/grid/grid_out.cc
deal.II/deal.II/source/grid/grid_reordering.cc
deal.II/deal.II/source/grid/persistent_tria.cc
deal.II/deal.II/source/grid/tria.cc
deal.II/deal.II/source/grid/tria_boundary.cc
deal.II/deal.II/source/grid/tria_boundary_lib.cc
deal.II/deal.II/source/multigrid/mg_dof_handler.cc
deal.II/deal.II/source/numerics/data_out.cc
deal.II/deal.II/source/numerics/data_out_stack.cc
deal.II/deal.II/source/numerics/histogram.cc
deal.II/deal.II/source/numerics/solution_transfer.cc
deal.II/deal.II/source/numerics/vectors.cc
deal.II/lac/include/lac/block_sparse_matrix.h
deal.II/lac/include/lac/block_sparsity_pattern.h
deal.II/lac/include/lac/block_vector.h
deal.II/lac/include/lac/filtered_matrix.h
deal.II/lac/include/lac/full_matrix.templates.h
deal.II/lac/include/lac/precondition_block.h
deal.II/lac/include/lac/sparse_matrix_ez.h
deal.II/lac/include/lac/sparsity_pattern.h
deal.II/lac/include/lac/vector_memory.h

index 95fcf5b3bcf921151906202035ce525903df1967..ff2b8dda6eb58d4f5437db0588b7c51fa18833e5 100644 (file)
@@ -59,6 +59,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl
        AC_MSG_RESULT(C++ compiler is gcc-3.2)
        GXX_VERSION=gcc3.2
        ;;
+      *3.3*)
+       AC_MSG_RESULT(C++ compiler is gcc-3.3)
+       GXX_VERSION=gcc3.3
+       ;;
       *2.4* | *2.5* | *2.6* | *2.7* | *2.8*)
        dnl These compilers are too old to support a useful subset
        dnl of modern C++, so we don't support them
@@ -556,9 +560,16 @@ AC_DEFUN(DEAL_II_DETERMINE_F77_BRAND, dnl
          AC_MSG_RESULT(F77 compiler is gcc-3.2)
          F77_VERSION=gcc3.2
          ;;
+        *3.3*)
+         AC_MSG_RESULT(F77 compiler is gcc-3.3)
+         F77_VERSION=gcc3.3
+         ;;
         *2.4* | *2.5* | *2.6* | *2.7* | *2.8*)
          dnl These compilers are too old to support a useful subset
-         dnl of modern C++, so we don't support them
+         dnl of modern C++, so we don't support them. gcc2.7.2 is 
+         dnl probably the only one that around on reasonably modern
+         dnl systems these times, but maybe someone tries to run
+         dnl deal.II on really old systems?
          AC_MSG_RESULT(F77 compiler is $G77_VERSION_STRING)
          AC_MSG_ERROR(F77 compiler is not supported)
          ;;
@@ -630,7 +641,7 @@ dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_SET_F77_FLAGS, dnl
 [
   case "$F77_VERSION" in
-    egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc3.0 | gcc3.1 | gcc3.2)
+    egcs-1.1 | gcc2.95 | gcc2.96 | gcc2.97 | gcc3.[0123])
         F77FLAGSG="$FFLAGS -ggdb -DDEBUG -pedantic -W -Wall"
         F77FLAGSO="$FFLAGS -O2"
   
index 522e5f244371f2bc7532ffc22bd967326a1f9ca1..1c5702814bfc8fdd661b0dff11cdc44e9049c564 100644 (file)
@@ -176,7 +176,7 @@ class AutoDerivativeFunction : public Function<dim>
                                      * @p{formula}.
                                      */
     virtual void vector_gradient (const Point<dim>            &p,
-                                 typename std::vector<Tensor<1,dim> > &gradients) const;
+                                 std::vector<Tensor<1,dim> > &gradients) const;
     
                                     /**
                                      * Set @p{gradients} to the
@@ -192,8 +192,8 @@ class AutoDerivativeFunction : public Function<dim>
                                      * @p{DifferenceFormula}
                                      * @p{formula}.
                                      */
-    virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                               typename std::vector<Tensor<1,dim> >    &gradients,
+    virtual void gradient_list (const std::vector<Point<dim> > &points,
+                               std::vector<Tensor<1,dim> >    &gradients,
                                const unsigned int              component = 0) const;
     
                                     /**
@@ -215,8 +215,8 @@ class AutoDerivativeFunction : public Function<dim>
                                      * @p{DifferenceFormula}
                                      * @p{formula}.
                                      */
-    virtual void vector_gradient_list (const typename std::vector<Point<dim> > &points,
-                                      typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const;
+    virtual void vector_gradient_list (const std::vector<Point<dim> > &points,
+                                      std::vector<std::vector<Tensor<1,dim> > > &gradients) const;
 
                                     /**
                                      * Returns a
@@ -243,7 +243,7 @@ class AutoDerivativeFunction : public Function<dim>
                                      * Includes the unit vectors
                                      * scaled by @p{h}.
                                      */
-    typename std::vector<Tensor<1,dim> > ht;
+    std::vector<Tensor<1,dim> > ht;
     
                                     /**
                                      * Difference formula. Set by the
index de191d23b4919840a4cb549549ac8f4410f65fbf..3a358780dc3ae83fea61f61c625a7cfc8f7732dd 100644 (file)
@@ -1276,7 +1276,7 @@ class DataOutBase
                                      * on the parameters.
                                      */
     template <int dim, int spacedim>
-    static void write_dx (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_dx (const std::vector<Patch<dim,spacedim> > &patches,
                          const std::vector<std::string>          &data_names,
                          const DXFlags                          &flags,
                          std::ostream                            &out);
@@ -1289,7 +1289,7 @@ class DataOutBase
                                      * on the parameters.
                                      */
     template <int dim, int spacedim>
-    static void write_ucd (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_ucd (const std::vector<Patch<dim,spacedim> > &patches,
                           const std::vector<std::string>          &data_names,
                           const UcdFlags                          &flags,
                           std::ostream                            &out);
@@ -1302,7 +1302,7 @@ class DataOutBase
                                      * on the parameters.
                                      */
     template <int dim, int spacedim>
-    static void write_gnuplot (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_gnuplot (const std::vector<Patch<dim,spacedim> > &patches,
                               const std::vector<std::string>          &data_names,
                               const GnuplotFlags                      &flags,
                               std::ostream                            &out);
@@ -1315,7 +1315,7 @@ class DataOutBase
                                      * on the parameters.
                                      */
     template <int dim, int spacedim>
-    static void write_povray (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_povray (const std::vector<Patch<dim,spacedim> > &patches,
                              const std::vector<std::string>          &data_names,
                              const PovrayFlags                       &flags,
                              std::ostream                            &out);
@@ -1328,7 +1328,7 @@ class DataOutBase
                                      * on the parameters.
                                      */
     template <int dim, int spacedim>
-    static void write_eps (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_eps (const std::vector<Patch<dim,spacedim> > &patches,
                           const std::vector<std::string>          &data_names,
                           const EpsFlags                          &flags,
                           std::ostream                            &out);
@@ -1341,7 +1341,7 @@ class DataOutBase
                                      * on the parameters.
                                      */
     template <int dim, int spacedim>
-    static void write_gmv (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_gmv (const std::vector<Patch<dim,spacedim> > &patches,
                           const std::vector<std::string>          &data_names,
                           const GmvFlags                          &flags,
                           std::ostream                            &out);
@@ -1354,7 +1354,7 @@ class DataOutBase
                                      * on the parameters.
                                      */
     template <int dim, int spacedim>
-    static void write_tecplot (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_tecplot (const std::vector<Patch<dim,spacedim> > &patches,
                               const std::vector<std::string>          &data_names,
                               const TecplotFlags                      &flags,
                               std::ostream                            &out);
@@ -1375,7 +1375,7 @@ class DataOutBase
                                      * ASCII output is still produced.
                                      */
     template <int dim, int spacedim>
-    static void write_tecplot_binary (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_tecplot_binary (const std::vector<Patch<dim,spacedim> > &patches,
                                      const std::vector<std::string>          &data_names,
                                      const TecplotFlags                      &flags,
                                      std::ostream                            &out);
@@ -1388,7 +1388,7 @@ class DataOutBase
                                      * information on the parameters.
                                      */
     template <int dim, int spacedim>
-    static void write_vtk (const typename std::vector<Patch<dim,spacedim> > &patches,
+    static void write_vtk (const std::vector<Patch<dim,spacedim> > &patches,
                           const std::vector<std::string>          &data_names,
                           const VtkFlags                          &flags,
                           std::ostream                            &out);
@@ -1526,7 +1526,7 @@ class DataOutBase
                                      */
     template <int dim, int spacedim>
     static void
-    write_gmv_reorder_data_vectors (const typename std::vector<Patch<dim,spacedim> > &patches,
+    write_gmv_reorder_data_vectors (const std::vector<Patch<dim,spacedim> > &patches,
                                    std::vector<std::vector<double> >       &data_vectors);
 
 };
@@ -1949,7 +1949,7 @@ class DataOutInterface : private DataOutBase
                                      * output functions to know what
                                      * they shall print.
                                      */
-    virtual const typename std::vector<typename DataOutBase::Patch<dim,spacedim> > &
+    virtual const std::vector<typename DataOutBase::Patch<dim,spacedim> > &
     get_patches () const = 0;
 
                                     /**
index 42a3d2365f4249311c21c32f37d9b8dfb83e32e4..0232847d8fbf819f89977414a1b7480e25aa7171 100644 (file)
@@ -200,7 +200,7 @@ class Function : public FunctionTime,
                                      * right size, i.e.  the same
                                      * size as the @p{points} array.
                                      */
-    virtual void value_list (const typename std::vector<Point<dim> > &points,
+    virtual void value_list (const std::vector<Point<dim> > &points,
                             std::vector<double>            &values,
                             const unsigned int              component = 0) const;
 
@@ -215,7 +215,7 @@ class Function : public FunctionTime,
                                      * the same number of components
                                      * as this function has.
                                      */
-    virtual void vector_value_list (const typename std::vector<Point<dim> > &points,
+    virtual void vector_value_list (const std::vector<Point<dim> > &points,
                                    std::vector<Vector<double> >   &values) const;
     
                                     /**
@@ -232,7 +232,7 @@ class Function : public FunctionTime,
                                      * function at the given point.
                                      */
     virtual void          vector_gradient (const Point<dim>            &p,
-                                          typename std::vector<Tensor<1,dim> > &gradients) const;
+                                          std::vector<Tensor<1,dim> > &gradients) const;
     
                                     /**
                                      * Set @p{gradients} to the
@@ -243,8 +243,8 @@ class Function : public FunctionTime,
                                      * right size, i.e.  the same
                                      * size as the @p{points} array.
                                      */
-    virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                               typename std::vector<Tensor<1,dim> >    &gradients,
+    virtual void gradient_list (const std::vector<Point<dim> > &points,
+                               std::vector<Tensor<1,dim> >    &gradients,
                                const unsigned int              component = 0) const;
     
                                     /**
@@ -261,8 +261,8 @@ class Function : public FunctionTime,
                                      * over the different components
                                      * of the function.
                                      */
-    virtual void vector_gradient_list (const typename std::vector<Point<dim> >            &points,
-                                      typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const;
+    virtual void vector_gradient_list (const std::vector<Point<dim> >            &points,
+                                      std::vector<std::vector<Tensor<1,dim> > > &gradients) const;
 
                                     /**
                                      * Compute the Laplacian of a
@@ -283,7 +283,7 @@ class Function : public FunctionTime,
                                      * Compute the Laplacian of one
                                      * component at a set of points.
                                      */
-    virtual void laplacian_list (const typename std::vector<Point<dim> > &points,
+    virtual void laplacian_list (const std::vector<Point<dim> > &points,
                                 std::vector<double>            &values,
                                 const unsigned int              component = 0) const;
 
@@ -291,7 +291,7 @@ class Function : public FunctionTime,
                                      * Compute the Laplacians of all
                                      * components at a set of points.
                                      */
-    virtual void vector_laplacian_list (const typename std::vector<Point<dim> > &points,
+    virtual void vector_laplacian_list (const std::vector<Point<dim> > &points,
                                        std::vector<Vector<double> >   &values) const;
 
                                     /**
@@ -367,7 +367,7 @@ class ZeroFunction : public Function<dim>
                                      * the same size as the @p{points}
                                      * array.
                                      */
-    virtual void value_list (const typename std::vector<Point<dim> > &points,
+    virtual void value_list (const std::vector<Point<dim> > &points,
                             std::vector<double>            &values,
                             const unsigned int              component = 0) const;
 
@@ -380,7 +380,7 @@ class ZeroFunction : public Function<dim>
                                      * the same size as the @p{points}
                                      * array.
                                      */
-    virtual void vector_value_list (const typename std::vector<Point<dim> > &points,
+    virtual void vector_value_list (const std::vector<Point<dim> > &points,
                                    std::vector<Vector<double> >   &values) const;
     
                                     /**
@@ -398,7 +398,7 @@ class ZeroFunction : public Function<dim>
                                      * for all components.
                                      */
     virtual void          vector_gradient (const Point<dim>            &p,
-                                          typename std::vector<Tensor<1,dim> > &gradients) const;
+                                          std::vector<Tensor<1,dim> > &gradients) const;
     
                                     /**
                                      * Set @p{gradients} to the gradients of
@@ -408,8 +408,8 @@ class ZeroFunction : public Function<dim>
                                      * already has the right size, i.e.
                                      * the same size as the @p{points} array.
                                      */
-    virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                               typename std::vector<Tensor<1,dim> >    &gradients,
+    virtual void gradient_list (const std::vector<Point<dim> > &points,
+                               std::vector<Tensor<1,dim> >    &gradients,
                                const unsigned int              component = 0) const;
     
                                     /**
@@ -426,8 +426,8 @@ class ZeroFunction : public Function<dim>
                                      * over the different components
                                      * of the function.
                                      */
-    virtual void vector_gradient_list (const typename std::vector<Point<dim> >            &points,
-                                      typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const;
+    virtual void vector_gradient_list (const std::vector<Point<dim> >            &points,
+                                      std::vector<std::vector<Tensor<1,dim> > > &gradients) const;
 };
 
 
@@ -497,7 +497,7 @@ class ConstantFunction : public ZeroFunction<dim>
                                      * the same size as the @p{points}
                                      * array.
                                      */
-    virtual void value_list (const typename std::vector<Point<dim> > &points,
+    virtual void value_list (const std::vector<Point<dim> > &points,
                             std::vector<double>            &values,
                             const unsigned int              component = 0) const;
 
@@ -510,7 +510,7 @@ class ConstantFunction : public ZeroFunction<dim>
                                      * the same size as the @p{points}
                                      * array.
                                      */
-    virtual void vector_value_list (const typename std::vector<Point<dim> > &points,
+    virtual void vector_value_list (const std::vector<Point<dim> > &points,
                                    std::vector<Vector<double> >   &values) const;
 
                                     /**
@@ -579,7 +579,7 @@ class ComponentSelectFunction : public ConstantFunction<dim>
                                      * the same size as the @p{points}
                                      * array.
                                      */
-    virtual void vector_value_list (const typename std::vector<Point<dim> > &points,
+    virtual void vector_value_list (const std::vector<Point<dim> > &points,
                                    std::vector<Vector<double> >   &values) const;
 
                                     /**
index 55f5794dcec08ba6f3060a755b02d88456e56dff..d5a717f74e1de2ed0e86c83583bf95bd3a395882 100644 (file)
@@ -81,7 +81,7 @@ class FunctionDerivative : public Function<dim>
                                      * values are accessed.
                                      */
     FunctionDerivative (const Function<dim>            &f,
-                       const typename std::vector<Point<dim> > &direction,
+                       const std::vector<Point<dim> > &direction,
                        const double                    h = 1.e-6);
     
                                     /**
@@ -109,7 +109,7 @@ class FunctionDerivative : public Function<dim>
                                      * Function values at multiple
                                      * points.
                                      */
-    virtual void value_list (const typename std::vector<Point<dim> > &points,
+    virtual void value_list (const std::vector<Point<dim> > &points,
                             std::vector<double>                     &values,
                             const unsigned int                       component = 0) const;    
 
@@ -156,7 +156,7 @@ class FunctionDerivative : public Function<dim>
                                      * increment vector for the
                                      * formula.
                                      */
-    typename std::vector<Point<dim> > incr;
+    std::vector<Point<dim> > incr;
 };
 
 #endif
index b462dc2270d04eac054d4dcb87b1ea7fb3a6bf4b..2a8dcc3c5c8f9dafbbe2caf8da4c03115fe55575 100644 (file)
@@ -52,7 +52,7 @@ namespace Functions
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
       
@@ -65,8 +65,8 @@ namespace Functions
                                       /**
                                          Gradients at multiple points.
                                       */
-      virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                                 typename std::vector<Tensor<1,dim> >    &gradients,
+      virtual void gradient_list (const std::vector<Point<dim> > &points,
+                                 std::vector<Tensor<1,dim> >    &gradients,
                                  const unsigned int              component = 0) const;
       
                                       /**
@@ -78,7 +78,7 @@ namespace Functions
                                       /**
                                        * Laplacian of the function at multiple points.
                                        */
-      virtual void laplacian_list (const typename std::vector<Point<dim> > &points,
+      virtual void laplacian_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int              component = 0) const;
   };
@@ -104,7 +104,7 @@ namespace Functions
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
       
@@ -117,8 +117,8 @@ namespace Functions
                                       /**
                                          Gradients at multiple points.
                                       */
-      virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                                 typename std::vector<Tensor<1,dim> >    &gradients,
+      virtual void gradient_list (const std::vector<Point<dim> > &points,
+                                 std::vector<Tensor<1,dim> >    &gradients,
                                  const unsigned int              component = 0) const;
       
                                       /**
@@ -130,7 +130,7 @@ namespace Functions
                                       /**
                                        * Laplacian of the function at multiple points.
                                        */
-      virtual void laplacian_list (const typename std::vector<Point<dim> > &points,
+      virtual void laplacian_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int              component = 0) const;
   };
@@ -171,7 +171,7 @@ namespace Functions
                                       /**
                                        * Values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
       
@@ -184,8 +184,8 @@ namespace Functions
                                       /**
                                        * Gradients at multiple points.
                                        */
-      virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                                 typename std::vector<Tensor<1,dim> >    &gradients,
+      virtual void gradient_list (const std::vector<Point<dim> > &points,
+                                 std::vector<Tensor<1,dim> >    &gradients,
                                  const unsigned int              component = 0) const;
       
                                       /**
@@ -197,7 +197,7 @@ namespace Functions
                                       /**
                                        * Laplacian at multiple points.
                                        */
-      virtual void laplacian_list (const typename std::vector<Point<dim> > &points,
+      virtual void laplacian_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int              component = 0) const;
     private:
@@ -225,7 +225,7 @@ namespace Functions
                                       /**
                                        * Values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
       
@@ -238,8 +238,8 @@ namespace Functions
                                       /**
                                        * Gradients at multiple points.
                                        */
-      virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                                 typename std::vector<Tensor<1,dim> >    &gradients,
+      virtual void gradient_list (const std::vector<Point<dim> > &points,
+                                 std::vector<Tensor<1,dim> >    &gradients,
                                  const unsigned int              component = 0) const;
       
                                       /**
@@ -251,7 +251,7 @@ namespace Functions
                                       /**
                                        * Laplacian at multiple points.
                                        */
-      virtual void laplacian_list (const typename std::vector<Point<dim> > &points,
+      virtual void laplacian_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int              component = 0) const;
       
@@ -264,8 +264,8 @@ namespace Functions
                                       /**
                                        * Gradients at multiple points.
                                        */
-      virtual void hessian_list (const typename std::vector<Point<dim> > &points,
-                                typename std::vector<Tensor<2,dim> >    &hessians,
+      virtual void hessian_list (const std::vector<Point<dim> > &points,
+                                std::vector<Tensor<2,dim> >    &hessians,
                                 const unsigned int              component = 0) const;
   };
   
@@ -288,7 +288,7 @@ namespace Functions
                                       /**
                                        * Values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
       
@@ -301,8 +301,8 @@ namespace Functions
                                       /**
                                        * Gradients at multiple points.
                                        */
-      virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                                 typename std::vector<Tensor<1,dim> >    &gradients,
+      virtual void gradient_list (const std::vector<Point<dim> > &points,
+                                 std::vector<Tensor<1,dim> >    &gradients,
                                  const unsigned int              component = 0) const;
       
                                       /**
@@ -314,7 +314,7 @@ namespace Functions
                                       /**
                                        * Laplacian at multiple points.
                                        */
-      virtual void laplacian_list (const typename std::vector<Point<dim> > &points,
+      virtual void laplacian_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int              component = 0) const;
   };
@@ -459,7 +459,7 @@ namespace Functions
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
       
@@ -472,8 +472,8 @@ namespace Functions
                                       /**
                                          Gradients at multiple points.
                                       */
-      virtual void gradient_list (const typename std::vector<Point<dim> > &points,
-                                 typename std::vector<Tensor<1,dim> >    &gradients,
+      virtual void gradient_list (const std::vector<Point<dim> > &points,
+                                 std::vector<Tensor<1,dim> >    &gradients,
                                  const unsigned int              component = 0) const;
       
                                       /**
@@ -485,7 +485,7 @@ namespace Functions
                                       /**
                                        * Laplacian of the function at multiple points.
                                        */
-      virtual void laplacian_list (const typename std::vector<Point<dim> > &points,
+      virtual void laplacian_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int              component = 0) const;
       
@@ -672,7 +672,7 @@ namespace Functions
                                        * coefficients in each space
                                        * direction as argument.
                                        */
-      FourierSineSum (const typename std::vector<Point<dim> > &fourier_coefficients,
+      FourierSineSum (const std::vector<Point<dim> > &fourier_coefficients,
                      const std::vector<double>      &weights);
       
                                       /**
@@ -714,7 +714,7 @@ namespace Functions
                                        * Stored Fourier coefficients
                                        * and weights.
                                        */
-      const typename std::vector<Point<dim> > fourier_coefficients;
+      const std::vector<Point<dim> > fourier_coefficients;
       const std::vector<double>      weights;
   };
 
@@ -738,7 +738,7 @@ namespace Functions
                                        * coefficients in each space
                                        * direction as argument.
                                        */
-      FourierCosineSum (const typename std::vector<Point<dim> > &fourier_coefficients,
+      FourierCosineSum (const std::vector<Point<dim> > &fourier_coefficients,
                        const std::vector<double>      &weights);
       
                                       /**
@@ -780,7 +780,7 @@ namespace Functions
                                        * Stored Fourier coefficients
                                        * and weights.
                                        */
-      const typename std::vector<Point<dim> > fourier_coefficients;
+      const std::vector<Point<dim> > fourier_coefficients;
       const std::vector<double>      weights;
   };
 
@@ -891,14 +891,14 @@ namespace Functions
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
 
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void vector_value_list (const typename std::vector<Point<dim> > &points,
+      virtual void vector_value_list (const std::vector<Point<dim> > &points,
                                      std::vector<Vector<double> >           &values) const;
   };
   
@@ -940,14 +940,14 @@ namespace Functions
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
 
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void vector_value_list (const typename std::vector<Point<dim> > &points,
+      virtual void vector_value_list (const std::vector<Point<dim> > &points,
                                      std::vector<Vector<double> >           &values) const;
   };
   
@@ -990,14 +990,14 @@ namespace Functions
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void value_list (const typename std::vector<Point<dim> > &points,
+      virtual void value_list (const std::vector<Point<dim> > &points,
                               std::vector<double>            &values,
                               const unsigned int              component = 0) const;
 
                                       /**
                                        * Function values at multiple points.
                                        */
-      virtual void vector_value_list (const typename std::vector<Point<dim> > &points,
+      virtual void vector_value_list (const std::vector<Point<dim> > &points,
                                      std::vector<Vector<double> >           &values) const;
 
                                       /**
index eb078e5aeb674a1108ea27a67dfbe0d02ec4fde7..aae8b8a1d17037e33a7ce7dc06ee1800d819cb20 100644 (file)
@@ -205,7 +205,7 @@ namespace MemoryConsumption
                                    */
   template <typename T>
   inline
-  unsigned int memory_consumption (const typename std::vector<T> &v);
+  unsigned int memory_consumption (const std::vector<T> &v);
 
                                   /**
                                    * Estimate the amount of memory
@@ -293,7 +293,7 @@ namespace MemoryConsumption
                                    */
   template <typename T>
   inline
-  unsigned int memory_consumption (const typename std::vector<T *> &v);
+  unsigned int memory_consumption (const std::vector<T *> &v);
 
                                   /** 
                                    * Specialization of the
@@ -318,7 +318,7 @@ namespace MemoryConsumption
                                    */
   template <typename A, typename B>
   inline
-  unsigned int memory_consumption (const typename std::pair<A,B> &p);
+  unsigned int memory_consumption (const std::pair<A,B> &p);
     
                                   /**
                                    * Return the amount of memory
@@ -466,7 +466,7 @@ namespace MemoryConsumption
 #endif
 
   template <typename T>
-  unsigned int memory_consumption (const typename std::vector<T> &v)
+  unsigned int memory_consumption (const std::vector<T> &v)
   {
     unsigned int mem = sizeof(std::vector<T>);
     const unsigned int n = v.size();
@@ -544,7 +544,7 @@ namespace MemoryConsumption
     
   template <typename T>
   inline
-  unsigned int memory_consumption (const typename std::vector<T *> &v)
+  unsigned int memory_consumption (const std::vector<T *> &v)
   {
     return (v.capacity() * sizeof(T *) +
            sizeof(v));
@@ -554,7 +554,7 @@ namespace MemoryConsumption
                                    
   template <typename A, typename B>
   inline
-  unsigned int memory_consumption (const typename std::pair<A,B> &p)
+  unsigned int memory_consumption (const std::pair<A,B> &p)
   {
     return (memory_consumption(p.first) +
            memory_consumption(p.second));
index 97b89b5ff63d697da17fee9c50b2fc3486e06ff9..e5eadbab0bd6be891ddbf13d28cf22e22c015986 100644 (file)
@@ -50,7 +50,7 @@ class Polynomial : public Subscriptor
                                      * the @p{coefficient} array
                                      * minus one.
                                      */
-    Polynomial (const typename std::vector<number> &coefficients);
+    Polynomial (const std::vector<number> &coefficients);
     
                                     /**
                                      * Return the value of this
@@ -78,8 +78,8 @@ class Polynomial : public Subscriptor
                                      * scheme for numerical stability
                                      * of the evaluation.
                                      */
-    void value (const number                  x,
-               typename std::vector<number> &values) const;
+    void value (const number         x,
+               std::vector<number> &values) const;
 
                                     /**
                                      * Degree of the polynomial. This
@@ -155,22 +155,24 @@ class Polynomial : public Subscriptor
   protected:
 
                                     /**
-                                     * This function performs the actual scaling.
+                                     * This function performs the
+                                     * actual scaling.
                                      */
-    static void scale (typename std::vector<number>& coefficients,
-                      const number factor);
+    static void scale (std::vector<number> &coefficients,
+                      const number         factor);
 
                                     /**
-                                     * This function performs the actual shift
+                                     * This function performs the
+                                     * actual shift
                                      */
     template <typename number2>
-    static void shift (typename std::vector<number>& coefficients,
-                      const number2 shift);
+    static void shift (std::vector<number> &coefficients,
+                      const number2        shift);
 
                                     /**
                                      * Multiply polynomial by a factor.
                                      */
-    static void multiply (typename std::vector<number>& coefficients,
+    static void multiply (std::vector<number>& coefficients,
                          const number factor);
     
                                     /**
@@ -185,7 +187,7 @@ class Polynomial : public Subscriptor
                                      * since we want to allow copying
                                      * of polynomials.
                                      */
-    typename std::vector<number> coefficients;
+    std::vector<number> coefficients;
 };
 
 
@@ -302,7 +304,7 @@ class Legendre : public Polynomial<number>
                                     /**
                                      * Coefficients for the interval $[0,1]$.
                                      */
-    static typename std::vector<const typename std::vector<number> *> shifted_coefficients;
+    static std::vector<const std::vector<number> *> shifted_coefficients;
     
                                     /**
                                      * Vector with already computed
@@ -314,7 +316,7 @@ class Legendre : public Polynomial<number>
                                      * vectors in order to simplify
                                      * programming multithread-safe.
                                      */
-    static typename std::vector<const typename std::vector<number> *> recursive_coefficients;
+    static std::vector<const std::vector<number> *> recursive_coefficients;
     
                                     /**
                                      * Compute coefficients recursively.
@@ -328,7 +330,7 @@ class Legendre : public Polynomial<number>
                                      * constructor of
                                      * @ref{Polynomial}.
                                      */
-    static const typename std::vector<number> &
+    static const std::vector<number> &
     get_coefficients (const unsigned int k);
 };
 
index 586642a612c59d609d7d3f22aa86b16e43b11184..a2b2cc98dd76c3f44080a59eeb9f7cf2d02edda1 100644 (file)
@@ -55,7 +55,7 @@ class PolynomialSpace
                                      * @p{Polynomial<double>}.
                                      */
     template <class Pol>
-    PolynomialSpace(const typename std::vector<Pol> &pols);
+    PolynomialSpace(const std::vector<Pol> &pols);
 
                                     /**
                                      * Computes the value and the
@@ -81,8 +81,8 @@ class PolynomialSpace
                                      */
     void compute (const Point<dim>                     &unit_point,
                  std::vector<double>                  &values,
-                 typename std::vector<Tensor<1,dim> > &grads,
-                 typename std::vector<Tensor<2,dim> > &grad_grads) const;
+                 std::vector<Tensor<1,dim> > &grads,
+                 std::vector<Tensor<2,dim> > &grad_grads) const;
     
                                     /**
                                      * Computes the value of the
@@ -179,7 +179,7 @@ class PolynomialSpace
 template <int dim>
 template <class Pol>
 PolynomialSpace<dim>::
-PolynomialSpace (const typename std::vector<Pol> &pols)
+PolynomialSpace (const std::vector<Pol> &pols)
                :
                polynomials (pols.begin(), pols.end()),
                n_pols (compute_n_pols(polynomials.size()))
index 2abba151480efdc9f6862a51474d59d39526568f..6c561493bb51e87668525d75017427f1b322e105 100644 (file)
@@ -170,8 +170,8 @@ class Quadrature : public Subscriptor
                                      * the weights sum up to one, but
                                      * this is not checked.
                                      */
-    Quadrature (const typename std::vector<Point<dim> > &points,
-               const std::vector<double>               &weights);
+    Quadrature (const std::vector<Point<dim> > &points,
+               const std::vector<double>      &weights);
 
                                     /**
                                      * Construct a dummy quadrature
@@ -188,7 +188,7 @@ class Quadrature : public Subscriptor
                                      * transformed cell in real
                                      * space.
                                      */
-    Quadrature (const typename std::vector<Point<dim> > &points);
+    Quadrature (const std::vector<Point<dim> > &points);
 
                                     /**
                                      * Constructor for a one-point
@@ -211,7 +211,7 @@ class Quadrature : public Subscriptor
                                      * Return a reference to the whole array of
                                      * quadrature points.
                                      */
-    const typename std::vector<Point<dim> > & get_points () const;
+    const std::vector<Point<dim> > & get_points () const;
     
                                     /**
                                      * Return the weight of the @p{i}th
@@ -238,7 +238,7 @@ class Quadrature : public Subscriptor
                                      * List of quadrature points. To be filled
                                      * by the constructors of derived classes.
                                      */
-    typename std::vector<Point<dim> > quadrature_points;
+    std::vector<Point<dim> > quadrature_points;
 
                                     /**
                                      * List of weights of the quadrature points.
@@ -420,7 +420,7 @@ class QProjector
                                      */
     static void project_to_face (const SubQuadrature &quadrature,
                                 const unsigned int      face_no,
-                                typename std::vector<Point<dim> > &q_points);
+                                std::vector<Point<dim> > &q_points);
 
                                     /**
                                      * Compute the quadrature points
@@ -434,7 +434,7 @@ class QProjector
     static void project_to_subface (const SubQuadrature &quadrature,
                                    const unsigned int   face_no,
                                    const unsigned int   subface_no,
-                                   typename std::vector<Point<dim> > &q_points);
+                                   std::vector<Point<dim> > &q_points);
 
                                     /**
                                      * Take a face quadrature formula
index 46127f55a31a9a33507ad230988577cf2fbafd57..e61d0ad6b32d8e9f5b36b68a4ab76a07acb0a624 100644 (file)
@@ -137,8 +137,8 @@ class TensorFunction : public FunctionTime,
                                      * the right size, i.e.  the same
                                      * size as the @p{points} array.  
                                      */
-    virtual void value_list (const typename std::vector<Point<dim> > &points,
-                            typename std::vector<value_type> &values) const;
+    virtual void value_list (const std::vector<Point<dim> > &points,
+                            std::vector<value_type> &values) const;
 
                                     /**
                                      * Return the gradient of the
@@ -154,8 +154,8 @@ class TensorFunction : public FunctionTime,
                                      * the right size, i.e.  the same
                                      * size as the @p{points} array.  
                                      */
-    virtual void gradient_list (const typename std::vector<Point<dim> >   &points,
-                               typename std::vector<gradient_type> &gradients) const;
+    virtual void gradient_list (const std::vector<Point<dim> >   &points,
+                               std::vector<gradient_type> &gradients) const;
 
                                     /**
                                      * Exception
index 531938bdaf33a2d2ba7ddfe1b97a2e370bfcf62e..06801ee2aaf6f73e6c37901eed67b02a652b5ccf 100644 (file)
@@ -48,7 +48,7 @@ class TensorProductPolynomials
                                      * member variable @p{polynomials}.
                                      */
     template <class Pol>
-    TensorProductPolynomials(const typename std::vector<Pol> &pols);
+    TensorProductPolynomials(const std::vector<Pol> &pols);
 
                                     /**
                                      * Computes the value and the
@@ -76,8 +76,8 @@ class TensorProductPolynomials
                                      */
     void compute(const Point<dim>                     &unit_point,
                 std::vector<double>                  &values,
-                typename std::vector<Tensor<1,dim> > &grads,
-                typename std::vector<Tensor<2,dim> > &grad_grads) const;
+                std::vector<Tensor<1,dim> > &grads,
+                std::vector<Tensor<2,dim> > &grad_grads) const;
     
                                     /**
                                      * Computes the value of the
@@ -214,7 +214,7 @@ class TensorProductPolynomials
 template <int dim>
 template <class Pol>
 TensorProductPolynomials<dim>::
-TensorProductPolynomials(const typename std::vector<Pol> &pols)
+TensorProductPolynomials(const std::vector<Pol> &pols)
                :
                polynomials (pols.begin(), pols.end()),
                n_tensor_pols(power(pols.size(), dim)),
index 93926697354b851c7b9d8919f0ce52ae4900762e..31eb3d17b0f8b73103f94c51f0d1393d8cfad865 100644 (file)
@@ -4577,7 +4577,7 @@ namespace Threads
                                    * @p{[begin[i],end[i])}.
                                    */
   template <typename ForwardIterator>
-  typename std::vector<typename std::pair<ForwardIterator,ForwardIterator> >
+  std::vector<std::pair<ForwardIterator,ForwardIterator> >
   split_range (const ForwardIterator &begin,
               const ForwardIterator &end,
               const unsigned int n_intervals);
@@ -7374,12 +7374,12 @@ namespace Threads
 
   
   template <typename ForwardIterator>
-  typename std::vector<typename std::pair<ForwardIterator,ForwardIterator> >
+  std::vector<std::pair<ForwardIterator,ForwardIterator> >
   split_range (const ForwardIterator &begin,
               const ForwardIterator &end,
               const unsigned int     n_intervals)
   {
-    typedef typename std::pair<ForwardIterator,ForwardIterator> IteratorPair;
+    typedef std::pair<ForwardIterator,ForwardIterator> IteratorPair;
 
                                     // in non-multithreaded mode, we
                                     // often have the case that this
@@ -7389,7 +7389,7 @@ namespace Threads
                                     // case efficiently
     
     if (n_intervals==1)
-      return (typename std::vector<IteratorPair>
+      return (std::vector<IteratorPair>
              (1, IteratorPair(begin, end)));
     
                                     // if more than one interval
index 5d44b32cc4e34f2509268e808dde6b0f863b1f92..25aec586a21a14c0bc3f49da260485773e728f2d 100644 (file)
@@ -118,7 +118,7 @@ AutoDerivativeFunction<dim>::gradient (const Point<dim>   &p,
 
 template <int dim>
 void AutoDerivativeFunction<dim>::vector_gradient (const Point<dim>       &p,
-                                                  typename std::vector<Tensor<1,dim> > &gradients) const
+                                                  std::vector<Tensor<1,dim> > &gradients) const
 {
   Assert (gradients.size() == this->n_components,
          ExcDimensionMismatch(gradients.size(), this->n_components));
@@ -188,8 +188,8 @@ void AutoDerivativeFunction<dim>::vector_gradient (const Point<dim>       &p,
 
 
 template <int dim>
-void AutoDerivativeFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &points,
-                                                typename std::vector<Tensor<1,dim> >    &gradients,
+void AutoDerivativeFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
+                                                std::vector<Tensor<1,dim> >    &gradients,
                                                 const unsigned int              comp) const
 {
   Assert (gradients.size() == points.size(),
@@ -247,8 +247,8 @@ void AutoDerivativeFunction<dim>::gradient_list (const typename std::vector<Poin
 template <int dim>
 void 
 AutoDerivativeFunction<dim>::
-vector_gradient_list (const typename std::vector<Point<dim> >            &points,
-                     typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const
+vector_gradient_list (const std::vector<Point<dim> >            &points,
+                     std::vector<std::vector<Tensor<1,dim> > > &gradients) const
 {
   Assert (gradients.size() == points.size(),
          ExcDimensionMismatch(gradients.size(), points.size()));
index fdf4099731cf841056ceacb80600f7c706a5afc0..9a0fd33d5aeb0768d01806d309d249342db54beb 100644 (file)
@@ -66,7 +66,7 @@ DataOutBase::Patch<dim,spacedim>::memory_consumption () const
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_ucd (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_ucd (const std::vector<Patch<dim,spacedim> > &patches,
                             const std::vector<std::string>          &data_names,
                             const UcdFlags                          &flags,
                             std::ostream                            &out) 
@@ -476,7 +476,7 @@ void DataOutBase::write_ucd (const typename std::vector<Patch<dim,spacedim> > &p
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_dx (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_dx (const std::vector<Patch<dim,spacedim> > &patches,
                            const std::vector<std::string>          &data_names,
                            const DXFlags                           &flags,
                            std::ostream                            &out) 
@@ -974,7 +974,7 @@ void DataOutBase::write_dx (const typename std::vector<Patch<dim,spacedim> > &pa
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_gnuplot (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_gnuplot (const std::vector<Patch<dim,spacedim> > &patches,
                                 const std::vector<std::string>          &data_names,
                                 const GnuplotFlags                      &/*flags*/,
                                 std::ostream                            &out) 
@@ -1262,7 +1262,7 @@ void DataOutBase::write_gnuplot (const typename std::vector<Patch<dim,spacedim>
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_povray (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_povray (const std::vector<Patch<dim,spacedim> > &patches,
                                const std::vector<std::string>          &data_names,
                                const PovrayFlags                       &flags,
                                std::ostream                            &out) 
@@ -1624,7 +1624,7 @@ void DataOutBase::write_povray (const typename std::vector<Patch<dim,spacedim> >
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_eps (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_eps (const std::vector<Patch<dim,spacedim> > &patches,
                             const std::vector<std::string>          &/*data_names*/,
                             const EpsFlags                          &flags,
                             std::ostream                            &out) 
@@ -1988,7 +1988,7 @@ void DataOutBase::write_eps (const typename std::vector<Patch<dim,spacedim> > &p
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_gmv (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_gmv (const std::vector<Patch<dim,spacedim> > &patches,
                             const std::vector<std::string>          &data_names,
                             const GmvFlags                          &/*flags*/,
                             std::ostream                            &out) 
@@ -2067,7 +2067,7 @@ void DataOutBase::write_gmv (const typename std::vector<Patch<dim,spacedim> > &p
   std::vector<std::vector<double> > data_vectors (n_data_sets,
                                                  std::vector<double> (n_nodes));
   Threads::ThreadManager thread_manager;
-  void (*fun_ptr) (const typename std::vector<Patch<dim,spacedim> > &,
+  void (*fun_ptr) (const std::vector<Patch<dim,spacedim> > &,
                   std::vector<std::vector<double> >                &)
     = &DataOutBase::template write_gmv_reorder_data_vectors<dim,spacedim>;
   Threads::spawn (thread_manager,
@@ -2303,7 +2303,7 @@ void DataOutBase::write_gmv (const typename std::vector<Patch<dim,spacedim> > &p
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_tecplot (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_tecplot (const std::vector<Patch<dim,spacedim> > &patches,
                                 const std::vector<std::string>          &data_names,
                                 const TecplotFlags                      &/*flags*/,
                                 std::ostream                            &out)
@@ -2447,7 +2447,7 @@ void DataOutBase::write_tecplot (const typename std::vector<Patch<dim,spacedim>
    std::vector<std::vector<double> > data_vectors (n_data_sets,
                                                   std::vector<double> (n_nodes));
    Threads::ThreadManager thread_manager;
-   void (*fun_ptr) (const typename std::vector<Patch<dim,spacedim> > &,
+   void (*fun_ptr) (const std::vector<Patch<dim,spacedim> > &,
                    std::vector<std::vector<double> >                &)
      = &DataOutBase::template write_gmv_reorder_data_vectors<dim,spacedim>;
    Threads::spawn (thread_manager,
@@ -2720,7 +2720,7 @@ int & TecplotMacros::cd(const unsigned int i, const unsigned int j)
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_tecplot_binary (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_tecplot_binary (const std::vector<Patch<dim,spacedim> > &patches,
                                        const std::vector<std::string>          &data_names,
                                        const TecplotFlags                      &flags,
                                        std::ostream                            &out)
@@ -2874,7 +2874,7 @@ void DataOutBase::write_tecplot_binary (const typename std::vector<Patch<dim,spa
    std::vector<std::vector<double> > data_vectors (n_data_sets,
                                                   std::vector<double> (n_nodes));
    Threads::ThreadManager thread_manager;
-   void (*fun_ptr) (const typename std::vector<Patch<dim,spacedim> > &,
+   void (*fun_ptr) (const std::vector<Patch<dim,spacedim> > &,
                    std::vector<std::vector<double> >                &)
      = &DataOutBase::template write_gmv_reorder_data_vectors<dim,spacedim>;
    Threads::spawn (thread_manager,
@@ -3102,7 +3102,7 @@ void DataOutBase::write_tecplot_binary (const typename std::vector<Patch<dim,spa
 
 
 template <int dim, int spacedim>
-void DataOutBase::write_vtk (const typename std::vector<Patch<dim,spacedim> > &patches,
+void DataOutBase::write_vtk (const std::vector<Patch<dim,spacedim> > &patches,
                             const std::vector<std::string>          &data_names,
                             const VtkFlags                          &/*flags*/,
                             std::ostream                            &out) 
@@ -3198,7 +3198,7 @@ void DataOutBase::write_vtk (const typename std::vector<Patch<dim,spacedim> > &p
   std::vector<std::vector<double> > data_vectors (n_data_sets,
                                                  std::vector<double> (n_nodes));
   Threads::ThreadManager thread_manager;
-  void (*fun_ptr) (const typename std::vector<Patch<dim,spacedim> > &,
+  void (*fun_ptr) (const std::vector<Patch<dim,spacedim> > &,
                   std::vector<std::vector<double> >                &)
     = &DataOutBase::template write_gmv_reorder_data_vectors<dim,spacedim>;
   Threads::spawn (thread_manager,
@@ -3433,7 +3433,7 @@ void DataOutBase::write_vtk (const typename std::vector<Patch<dim,spacedim> > &p
 
 template <int dim, int spacedim>
 void
-DataOutBase::write_gmv_reorder_data_vectors (const typename std::vector<Patch<dim,spacedim> > &patches,
+DataOutBase::write_gmv_reorder_data_vectors (const std::vector<Patch<dim,spacedim> > &patches,
                                             std::vector<std::vector<double> >       &data_vectors)
 {
                                   // unlike in the main function, we
index d97171adafca93a86267dfc700461b6bd9444f72..3949e15669cbf62bba205d573b58e442ad808dc2 100644 (file)
@@ -54,7 +54,7 @@ using namespace std;
 #endif
 
 template <int dim>
-void Function<dim>::value_list (const typename std::vector<Point<dim> > &points,
+void Function<dim>::value_list (const std::vector<Point<dim> > &points,
                                std::vector<double>                     &values,
                                const unsigned int                       component) const
 {
@@ -70,7 +70,7 @@ void Function<dim>::value_list (const typename std::vector<Point<dim> > &points,
 
 
 template <int dim>
-void Function<dim>::vector_value_list (const typename std::vector<Point<dim> > &points,
+void Function<dim>::vector_value_list (const std::vector<Point<dim> > &points,
                                       std::vector<Vector<double> >   &values) const
 {
                                   // check whether component is in
@@ -95,15 +95,15 @@ Tensor<1,dim> Function<dim>::gradient (const Point<dim> &,
 
 template <int dim>
 void Function<dim>::vector_gradient (const Point<dim>       &,
-                                    typename std::vector<Tensor<1,dim> > &) const
+                                    std::vector<Tensor<1,dim> > &) const
 {
   Assert (false, ExcPureFunctionCalled());
 };
 
 
 template <int dim>
-void Function<dim>::gradient_list (const typename std::vector<Point<dim> > &points,
-                                  typename std::vector<Tensor<1,dim> >    &gradients,
+void Function<dim>::gradient_list (const std::vector<Point<dim> > &points,
+                                  std::vector<Tensor<1,dim> >    &gradients,
                                   const unsigned int              component) const
 {
   Assert (gradients.size() == points.size(),
@@ -115,8 +115,8 @@ void Function<dim>::gradient_list (const typename std::vector<Point<dim> > &poin
 
 
 template <int dim>
-void Function<dim>::vector_gradient_list (const typename std::vector<Point<dim> >            &points,
-                                         typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const
+void Function<dim>::vector_gradient_list (const std::vector<Point<dim> >            &points,
+                                         std::vector<std::vector<Tensor<1,dim> > > &gradients) const
 {
   Assert (gradients.size() == points.size(),
          ExcDimensionMismatch(gradients.size(), points.size()));
@@ -151,7 +151,7 @@ void Function<dim>::vector_laplacian (const Point<dim> &,
 
 
 template <int dim>
-void Function<dim>::laplacian_list (const typename std::vector<Point<dim> > &points,
+void Function<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                    std::vector<double>            &laplacians,
                                    const unsigned int              component) const
 {
@@ -167,7 +167,7 @@ void Function<dim>::laplacian_list (const typename std::vector<Point<dim> > &poi
 
 
 template <int dim>
-void Function<dim>::vector_laplacian_list (const typename std::vector<Point<dim> > &points,
+void Function<dim>::vector_laplacian_list (const std::vector<Point<dim> > &points,
                                           std::vector<Vector<double> >   &laplacians) const
 {
                                   // check whether component is in
@@ -225,7 +225,7 @@ void ZeroFunction<dim>::vector_value (const Point<dim> &,
 
 
 template <int dim>
-void ZeroFunction<dim>::value_list (const typename std::vector<Point<dim> > &points,
+void ZeroFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                    std::vector<double>            &values,
                                    const unsigned int         /*component*/) const {
   Assert (values.size() == points.size(),
@@ -236,7 +236,7 @@ void ZeroFunction<dim>::value_list (const typename std::vector<Point<dim> > &poi
 
 
 template <int dim>
-void ZeroFunction<dim>::vector_value_list (const typename std::vector<Point<dim> > &points,
+void ZeroFunction<dim>::vector_value_list (const std::vector<Point<dim> > &points,
                                           std::vector<Vector<double> >   &values) const
 {
   Assert (values.size() == points.size(),
@@ -261,7 +261,7 @@ Tensor<1,dim> ZeroFunction<dim>::gradient (const Point<dim> &,
 
 template <int dim>
 void ZeroFunction<dim>::vector_gradient (const Point<dim>       &,
-                                        typename std::vector<Tensor<1,dim> > &gradients) const
+                                        std::vector<Tensor<1,dim> > &gradients) const
 {
   Assert (gradients.size() == this->n_components,
          ExcDimensionMismatch(gradients.size(), this->n_components));
@@ -272,8 +272,8 @@ void ZeroFunction<dim>::vector_gradient (const Point<dim>       &,
 
 
 template <int dim>
-void ZeroFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &points,
-                                      typename std::vector<Tensor<1,dim> >    &gradients,
+void ZeroFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
+                                      std::vector<Tensor<1,dim> >    &gradients,
                                       const unsigned int              /*component*/) const
 {
   Assert (gradients.size() == points.size(),
@@ -285,8 +285,8 @@ void ZeroFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &
 
 
 template <int dim>
-void ZeroFunction<dim>::vector_gradient_list (const typename std::vector<Point<dim> >            &points,
-                                             typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const
+void ZeroFunction<dim>::vector_gradient_list (const std::vector<Point<dim> >            &points,
+                                             std::vector<std::vector<Tensor<1,dim> > > &gradients) const
 {
   Assert (gradients.size() == points.size(),
          ExcDimensionMismatch(gradients.size(), points.size()));
@@ -334,7 +334,7 @@ void ConstantFunction<dim>::vector_value (const Point<dim> &,
 
 
 template <int dim>
-void ConstantFunction<dim>::value_list (const typename std::vector<Point<dim> > &points,
+void ConstantFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                        std::vector<double>            &values,
                                        const unsigned int              /*component*/) const
 {
@@ -346,7 +346,7 @@ void ConstantFunction<dim>::value_list (const typename std::vector<Point<dim> >
 
 
 template <int dim>
-void ConstantFunction<dim>::vector_value_list (const typename std::vector<Point<dim> > &points,
+void ConstantFunction<dim>::vector_value_list (const std::vector<Point<dim> > &points,
                                               std::vector<Vector<double> >   &values) const
 {
   Assert (values.size() == points.size(),
@@ -397,7 +397,7 @@ void ComponentSelectFunction<dim>::vector_value (const Point<dim> &,
 
 
 template <int dim>
-void ComponentSelectFunction<dim>::vector_value_list (const typename std::vector<Point<dim> > &points,
+void ComponentSelectFunction<dim>::vector_value_list (const std::vector<Point<dim> > &points,
                                                      std::vector<Vector<double> >   &values) const
 {
   Assert (values.size() == points.size(),
index 95a4bbd4d1ce51c7ccc78ec4c3b651c2dde8027f..633f1944411bf4146405288d7dbf6f00a2ff6446 100644 (file)
@@ -34,7 +34,7 @@ FunctionDerivative<dim>::FunctionDerivative (const Function<dim> &f,
 
 template <int dim>
 FunctionDerivative<dim>::FunctionDerivative (const Function<dim>& f,
-                                            const typename std::vector<Point<dim> >& dir,
+                                            const std::vector<Point<dim> >& dir,
                                             const double h)
                :
                Function<dim> (f.n_components, f.get_time()),
@@ -92,7 +92,7 @@ using namespace std;
 
 template <int dim>
 void
-FunctionDerivative<dim>::value_list (const typename std::vector<Point<dim> > &points,
+FunctionDerivative<dim>::value_list (const std::vector<Point<dim> > &points,
                                     std::vector<double>            &values,
                                     const unsigned int              component) const
 {
index 789a3d84d3891f8af403b64c40e480bc13969d72..6ba48bc36d48e644150ce4089a0deb521942b7fd 100644 (file)
@@ -51,7 +51,7 @@ namespace Functions
   
   template<int dim>
   void
-  SquareFunction<dim>::value_list (const typename std::vector<Point<dim> > &points,
+  SquareFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int) const
   {
@@ -77,7 +77,7 @@ namespace Functions
   
   template<int dim>
   void
-  SquareFunction<dim>::laplacian_list (const typename std::vector<Point<dim> > &points,
+  SquareFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                       std::vector<double>            &values,
                                       const unsigned int) const
   {
@@ -102,8 +102,8 @@ namespace Functions
   
   template<int dim>
   void
-  SquareFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &points,
-                                     typename std::vector<Tensor<1,dim> >    &gradients,
+  SquareFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
+                                     std::vector<Tensor<1,dim> >    &gradients,
                                      const unsigned int) const
   {
     Assert (gradients.size() == points.size(),
@@ -129,7 +129,7 @@ namespace Functions
   
   template<int dim>
   void
-  Q1WedgeFunction<dim>::value_list (const typename std::vector<Point<dim> > &points,
+  Q1WedgeFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                    std::vector<double>            &values,
                                    const unsigned int) const
   {
@@ -155,7 +155,7 @@ namespace Functions
   
   template<int dim>
   void
-  Q1WedgeFunction<dim>::laplacian_list (const typename std::vector<Point<dim> > &points,
+  Q1WedgeFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                        std::vector<double>            &values,
                                        const unsigned int) const
   {
@@ -183,8 +183,8 @@ namespace Functions
   
   template<int dim>
   void
-  Q1WedgeFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &points,
-                                      typename std::vector<Tensor<1,dim> >    &gradients,
+  Q1WedgeFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
+                                      std::vector<Tensor<1,dim> >    &gradients,
                                       const unsigned int) const
   {
     Assert (gradients.size() == points.size(),
@@ -229,7 +229,7 @@ namespace Functions
   
   template<int dim>
   void
-  PillowFunction<dim>::value_list (const typename std::vector<Point<dim> > &points,
+  PillowFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int) const
   {
@@ -281,7 +281,7 @@ namespace Functions
   
   template<int dim>
   void
-  PillowFunction<dim>::laplacian_list (const typename std::vector<Point<dim> > &points,
+  PillowFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                       std::vector<double>            &values,
                                       const unsigned int) const
   {
@@ -338,8 +338,8 @@ namespace Functions
   
   template<int dim>
   void
-  PillowFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &points,
-                                     typename std::vector<Tensor<1,dim> >    &gradients,
+  PillowFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
+                                     std::vector<Tensor<1,dim> >    &gradients,
                                      const unsigned int) const
   {
     Assert (gradients.size() == points.size(),
@@ -391,7 +391,7 @@ namespace Functions
   
   template<int dim>
   void
-  CosineFunction<dim>::value_list (const typename std::vector<Point<dim> > &points,
+  CosineFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                   std::vector<double>            &values,
                                   const unsigned int) const
   {
@@ -439,7 +439,7 @@ namespace Functions
   
   template<int dim>
   void
-  CosineFunction<dim>::laplacian_list (const typename std::vector<Point<dim> > &points,
+  CosineFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                       std::vector<double>            &values,
                                       const unsigned int) const
   {
@@ -494,8 +494,8 @@ namespace Functions
   
   template<int dim>
   void
-  CosineFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &points,
-                                     typename std::vector<Tensor<1,dim> >    &gradients,
+  CosineFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
+                                     std::vector<Tensor<1,dim> >    &gradients,
                                      const unsigned int) const
   {
     Assert (gradients.size() == points.size(),
@@ -575,8 +575,8 @@ namespace Functions
   
   template<int dim>
   void
-  CosineFunction<dim>::hessian_list (const typename std::vector<Point<dim> > &points,
-                                    typename std::vector<Tensor<2,dim> >    &hessians,
+  CosineFunction<dim>::hessian_list (const std::vector<Point<dim> > &points,
+                                    std::vector<Tensor<2,dim> >    &hessians,
                                     const unsigned int) const
   {
     Assert (hessians.size() == points.size(),
@@ -651,7 +651,7 @@ namespace Functions
   
   template<int dim>
   void
-  ExpFunction<dim>::value_list (const typename std::vector<Point<dim> > &points,
+  ExpFunction<dim>::value_list (const std::vector<Point<dim> > &points,
                                std::vector<double>            &values,
                                const unsigned int) const
   {
@@ -699,7 +699,7 @@ namespace Functions
   
   template<int dim>
   void
-  ExpFunction<dim>::laplacian_list (const typename std::vector<Point<dim> > &points,
+  ExpFunction<dim>::laplacian_list (const std::vector<Point<dim> > &points,
                                    std::vector<double>            &values,
                                    const unsigned int) const
   {
@@ -754,8 +754,8 @@ namespace Functions
   
   template<int dim>
   void
-  ExpFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &points,
-                                  typename std::vector<Tensor<1,dim> >    &gradients,
+  ExpFunction<dim>::gradient_list (const std::vector<Point<dim> > &points,
+                                  std::vector<Tensor<1,dim> >    &gradients,
                                   const unsigned int) const
   {
     Assert (gradients.size() == points.size(),
@@ -1024,7 +1024,7 @@ namespace Functions
   
   template<int dim>
   void
-  JumpFunction<dim>::value_list (const typename std::vector<Point<dim> > &p,
+  JumpFunction<dim>::value_list (const std::vector<Point<dim> > &p,
                                 std::vector<double>          &values,
                                 const unsigned int) const
   {
@@ -1052,7 +1052,7 @@ namespace Functions
   
   template<int dim>
   void
-  JumpFunction<dim>::laplacian_list (const typename std::vector<Point<dim> > &p,
+  JumpFunction<dim>::laplacian_list (const std::vector<Point<dim> > &p,
                                     std::vector<double>          &values,
                                     const unsigned int) const
   {
@@ -1088,8 +1088,8 @@ namespace Functions
   
   template<int dim>
   void
-  JumpFunction<dim>::gradient_list (const typename std::vector<Point<dim> > &p,
-                                   typename std::vector<Tensor<1,dim> >  &gradients,
+  JumpFunction<dim>::gradient_list (const std::vector<Point<dim> > &p,
+                                   std::vector<Tensor<1,dim> >  &gradients,
                                    const unsigned int) const
   {
     Assert (gradients.size() == p.size(),
@@ -1220,7 +1220,7 @@ namespace Functions
   
   template <int dim>
   FourierSineSum<dim>::
-  FourierSineSum (const typename std::vector<Point<dim> > &fourier_coefficients,
+  FourierSineSum (const std::vector<Point<dim> > &fourier_coefficients,
                  const std::vector<double>      &weights)
                  :
                  Function<dim> (1),
@@ -1291,7 +1291,7 @@ namespace Functions
   
   template <int dim>
   FourierCosineSum<dim>::
-  FourierCosineSum (const typename std::vector<Point<dim> > &fourier_coefficients,
+  FourierCosineSum (const std::vector<Point<dim> > &fourier_coefficients,
                    const std::vector<double>      &weights)
                     :
                     Function<dim> (1),
index 59105accd22768608585e96c2e65cfa09f36d29c..e122076160c1dbac3f2c788e4afbd0147a97c658 100644 (file)
@@ -97,8 +97,8 @@ namespace Functions
 
   template<int dim>
   void 
-  CutOffFunctionLinfty<dim>::value_list (const typename std::vector<Point<dim> > &points,
-                                        std::vector<double>                     &values,
+  CutOffFunctionLinfty<dim>::value_list (const std::vector<Point<dim> > &points,
+                                        std::vector<double>            &values,
                                         const unsigned int component) const
   {
     Assert (values.size() == points.size(),
@@ -120,7 +120,7 @@ namespace Functions
   template<int dim>
   void
   CutOffFunctionLinfty<dim>::vector_value_list (
-    const typename std::vector<Point<dim> > &points,
+    const std::vector<Point<dim> > &points,
     std::vector<Vector<double> >           &values) const
   {
     Assert (values.size() == points.size(),
@@ -169,8 +169,8 @@ namespace Functions
 
   template<int dim>
   void 
-  CutOffFunctionW1<dim>::value_list (const typename std::vector<Point<dim> > &points,
-                                    std::vector<double>                     &values,
+  CutOffFunctionW1<dim>::value_list (const std::vector<Point<dim> > &points,
+                                    std::vector<double>            &values,
                                     const unsigned int component) const
   {
     Assert (values.size() == points.size(),
@@ -193,7 +193,7 @@ namespace Functions
   template<int dim>
   void
   CutOffFunctionW1<dim>::vector_value_list (
-    const typename std::vector<Point<dim> > &points,
+    const std::vector<Point<dim> > &points,
     std::vector<Vector<double> >           &values) const
   {
     Assert (values.size() == points.size(),
@@ -247,8 +247,8 @@ namespace Functions
 
   template<int dim>
   void 
-  CutOffFunctionCinfty<dim>::value_list (const typename std::vector<Point<dim> > &points,
-                                        std::vector<double>                     &values,
+  CutOffFunctionCinfty<dim>::value_list (const std::vector<Point<dim> > &points,
+                                        std::vector<double>            &values,
                                         const unsigned int component) const
   {
     Assert (values.size() == points.size(),
@@ -278,7 +278,7 @@ namespace Functions
   template<int dim>
   void
   CutOffFunctionCinfty<dim>::vector_value_list (
-    const typename std::vector<Point<dim> > &points,
+    const std::vector<Point<dim> > &points,
     std::vector<Vector<double> >           &values) const
   {
     Assert (values.size() == points.size(),
index 68926d5858921e2607c9df1c15dc5b9680fec37e..4b059b830aaeb714440f72a8913cb7d1366f4886 100644 (file)
 // Reserve space for polynomials up to degree 19. Should be sufficient
 // for the start.
 template <typename number>
-typename std::vector<const typename std::vector<number> *>
+std::vector<const std::vector<number> *>
 Legendre<number>::recursive_coefficients(
-  20, static_cast<const typename std::vector<number>*>(0));
+  20, static_cast<const std::vector<number>*>(0));
 template <typename number>
-typename std::vector<const typename std::vector<number> *>
+std::vector<const std::vector<number> *>
 Legendre<number>::shifted_coefficients(
-  20, static_cast<const typename std::vector<number>*>(0));
+  20, static_cast<const std::vector<number>*>(0));
 
 
 // have a lock that guarantees that at most one thread is changing and
@@ -163,7 +163,7 @@ Legendre<number>::compute_coefficients (const unsigned int k_)
 
 
 template <typename number>
-const typename std::vector<number> &
+const std::vector<number> &
 Legendre<number>::get_coefficients (const unsigned int k)
 {
                                   // first make sure the coefficients
index c51c0052107b9166b92e41e465dd7d0db9d1177c..28050a6720778d5c48d3ee61a5cdb0f5d9d6b53a 100644 (file)
@@ -16,7 +16,7 @@
 #include <base/exceptions.h>
 
 template <typename number>
-Polynomial<number>::Polynomial (const typename std::vector<number> &a):
+Polynomial<number>::Polynomial (const std::vector<number> &a):
                coefficients(a)
 {}
 
@@ -42,7 +42,7 @@ Polynomial<number>::value (const number x) const
 template <typename number>
 void
 Polynomial<number>::value (const number         x,
-                       typename std::vector<number> &values) const
+                       std::vector<number> &values) const
 {
   Assert (coefficients.size() > 0, ExcVoidPolynomial());
   Assert (values.size() > 0, ExcEmptyArray());
@@ -94,7 +94,7 @@ Polynomial<number>::value (const number         x,
 
 template <typename number>
 void
-Polynomial<number>::scale(typename std::vector<number>& coefficients,
+Polynomial<number>::scale(std::vector<number>& coefficients,
                           const number factor)
 {
   double f = 1.;
@@ -119,7 +119,7 @@ Polynomial<number>::scale(const number factor)
 
 template <typename number>
 void
-Polynomial<number>::multiply(typename std::vector<number>& coefficients,
+Polynomial<number>::multiply(std::vector<number>& coefficients,
                             const number factor)
 {
   for (typename std::vector<number>::iterator c = coefficients.begin();
@@ -132,7 +132,7 @@ Polynomial<number>::multiply(typename std::vector<number>& coefficients,
 template <typename number>
 template <typename number2>
 void
-Polynomial<number>::shift(typename std::vector<number>& coefficients,
+Polynomial<number>::shift(std::vector<number>& coefficients,
                          const number2 offset)
 {  
 #ifdef DEAL_II_LONG_DOUBLE_LOOP_BUG
index 1c01c060b1d073adf4df70babfc716c1e3eec6a7..50e9453f26b20f448b445d5b841eb63f41fe3965 100644 (file)
@@ -136,8 +136,8 @@ template <int dim>
 void PolynomialSpace<dim>::compute(
   const Point<dim>                     &p,
   std::vector<double>                  &values,
-  typename std::vector<Tensor<1,dim> > &grads,
-  typename std::vector<Tensor<2,dim> > &grad_grads) const
+  std::vector<Tensor<1,dim> > &grads,
+  std::vector<Tensor<2,dim> > &grad_grads) const
 {
   const unsigned int n_1d=polynomials.size();
   
index cdfae8341f226d8fec5eed6b132c9e85873c432d..d32dc8c91cf403f80b44e6b4821ea9d9ad7d5743 100644 (file)
@@ -41,7 +41,7 @@ using namespace std;
 
 
 template <int dim>
-Quadrature<dim>::Quadrature (const typename std::vector<Point<dim> > &points,
+Quadrature<dim>::Quadrature (const std::vector<Point<dim> > &points,
                             const std::vector<double>               &weights)
                :
                n_quadrature_points(points.size()),
@@ -55,7 +55,7 @@ Quadrature<dim>::Quadrature (const typename std::vector<Point<dim> > &points,
 
 
 template <int dim>
-Quadrature<dim>::Quadrature (const typename std::vector<Point<dim> > &points)
+Quadrature<dim>::Quadrature (const std::vector<Point<dim> > &points)
                :
                n_quadrature_points(points.size()),
                quadrature_points(points),
@@ -170,7 +170,7 @@ const std::vector<Point<0> > & Quadrature<0>::get_points () const
 
 
 template <int dim>
-const typename std::vector<Point<dim> > & Quadrature<dim>::get_points () const
+const std::vector<Point<dim> > & Quadrature<dim>::get_points () const
 {
   return quadrature_points;
 };
@@ -582,7 +582,7 @@ QProjector<dim>::project_to_all_faces (const SubQuadrature &quadrature)
                     n_faces  = GeometryInfo<dim>::faces_per_cell;
 
                                   // first fix quadrature points
-  typename std::vector<Point<dim> > q_points (n_points * n_faces);
+  std::vector<Point<dim> > q_points (n_points * n_faces);
   std::vector <Point<dim> > help(n_points);
   
                                   // project to each face and copy
@@ -594,7 +594,7 @@ QProjector<dim>::project_to_all_faces (const SubQuadrature &quadrature)
     }
 
                                   // next copy over weights
-  typename std::vector<double> weights (n_points * n_faces);
+  std::vector<double> weights (n_points * n_faces);
   for (unsigned int face=0; face<n_faces; ++face)
     std::copy (quadrature.get_weights().begin(),
               quadrature.get_weights().end(),
@@ -624,7 +624,7 @@ QProjector<dim>::project_to_all_subfaces (const SubQuadrature &quadrature)
                     subfaces_per_face = GeometryInfo<dim>::subfaces_per_face;
   
                                   // first fix quadrature points
-  typename std::vector<Point<dim> > q_points (n_points * n_faces * subfaces_per_face);
+  std::vector<Point<dim> > q_points (n_points * n_faces * subfaces_per_face);
   std::vector <Point<dim> > help(n_points);
   
                                   // project to each face and copy
@@ -638,7 +638,7 @@ QProjector<dim>::project_to_all_subfaces (const SubQuadrature &quadrature)
       };
 
                                   // next copy over weights
-  typename std::vector<double> weights (n_points * n_faces * subfaces_per_face);
+  std::vector<double> weights (n_points * n_faces * subfaces_per_face);
   for (unsigned int face=0; face<n_faces; ++face)
     for (unsigned int subface=0; subface<subfaces_per_face; ++subface)
       std::copy (quadrature.get_weights().begin(),
index 8cfcb2f75ba8a45a8e15bfa54fe9ae7b3f04d146..a90138d94d539b201025b29b6cd6500352c71540 100644 (file)
@@ -52,8 +52,8 @@ using namespace std;
 
 template <int rank, int dim>
 void
-TensorFunction<rank, dim>::value_list (const typename std::vector<Point<dim> > &points,
-                                      typename std::vector<value_type>        &values) const
+TensorFunction<rank, dim>::value_list (const std::vector<Point<dim> > &points,
+                                      std::vector<value_type>        &values) const
 {
   Assert (values.size() == points.size(),
          ExcDimensionMismatch(values.size(), points.size()));
@@ -74,8 +74,8 @@ TensorFunction<rank, dim>::gradient (const Point<dim> &) const
 
 template <int rank, int dim>
 void
-TensorFunction<rank, dim>::gradient_list (const typename std::vector<Point<dim> >   &points,
-                                         typename std::vector<gradient_type> &gradients) const
+TensorFunction<rank, dim>::gradient_list (const std::vector<Point<dim> >   &points,
+                                         std::vector<gradient_type> &gradients) const
 {
   Assert (gradients.size() == points.size(),
          ExcDimensionMismatch(gradients.size(), points.size()));
index e6522ac3fdce6b438acee35f2e6f0d5d9b0ea631..a22a476790a0217d81223d222bce2070f2dc2165 100644 (file)
@@ -110,8 +110,8 @@ template <int dim>
 void TensorProductPolynomials<dim>::compute(
   const Point<dim>                     &p,
   std::vector<double>                  &values,
-  typename std::vector<Tensor<1,dim> > &grads,
-  typename std::vector<Tensor<2,dim> > &grad_grads) const
+  std::vector<Tensor<1,dim> > &grads,
+  std::vector<Tensor<2,dim> > &grad_grads) const
 {
   const unsigned int n_pols=polynomials.size();
   
index 1391ea40b6ae9c3fb590fbb2603fa057edcdf8e5..c744388bd96a37e37f5363ed4b190eeb973f849b 100644 (file)
@@ -1129,7 +1129,7 @@ class DoFHandler  :  public Subscriptor,
                                      * @p{levels[]} tree of the @ref{Triangulation}
                                      * objects.
                                      */
-    typename std::vector<DoFLevel<dim>*>    levels;
+    std::vector<DoFLevel<dim>*>    levels;
 
                                     /**
                                      * Store the number of dofs created last
index be1060f52480f3a038dfe0a7db6c6d082a8caef6..e8409aaab0ad8d182c6049ef587abf9074ab6c92 100644 (file)
@@ -1066,7 +1066,7 @@ class DoFTools
     static void
     map_dofs_to_support_points (const Mapping<dim>                &mapping,
                                const DoFHandler<dim>             &dof_handler,
-                               typename std::vector<Point<dim> > &support_points);
+                               std::vector<Point<dim> > &support_points);
 
                                     /**
                                      * This is the opposite function
@@ -1099,7 +1099,7 @@ class DoFTools
     static void
     map_support_points_to_dofs (const Mapping<dim>       &mapping,
                                const DoFHandler<dim>    &dof_handler,
-                               typename std::map<Point<dim>, unsigned int, Comp> &point_to_index_map);
+                               std::map<Point<dim>, unsigned int, Comp> &point_to_index_map);
     
                                     /**
                                      * Exception
@@ -1210,7 +1210,7 @@ void
 DoFTools::
 map_support_points_to_dofs (const Mapping<dim>       &mapping,
                            const DoFHandler<dim>    &dof_handler,
-                           typename std::map<Point<dim>, unsigned int, Comp> &point_to_index_map)
+                           std::map<Point<dim>, unsigned int, Comp> &point_to_index_map)
 {
                                   // let the checking of arguments be
                                   // done by the function first
index a338b58e25e8323035fc0520c0d36377ca756bb5..71a86fe8a339385ef867662429b85c0349d2dd35 100644 (file)
@@ -45,7 +45,7 @@ struct FunctionMap
                                      * name it in the fashion of the
                                      * STL local typedefs.
                                      */
-    typedef typename std::map<unsigned char, const Function<dim>*> type;
+    typedef std::map<unsigned char, const Function<dim>*> type;
 };
 
 
index 0a3d4d6726e69235bd8bbf98d1517958e6293d0c..6d2312c7f58ca9ffb70784d329356f706f02c3ff 100644 (file)
@@ -404,7 +404,7 @@ class FiniteElementBase : public Subscriptor,
                                          * entries in lower dimensions
                                          * are missing.
                                          */
-       typename std::vector<FEValues<dim>*> differences;
+       std::vector<FEValues<dim>*> differences;
     };
   
                                     /**
@@ -851,7 +851,7 @@ class FiniteElementBase : public Subscriptor,
                                      * See the class documentation
                                      * for details on support points.
                                      */
-    const typename std::vector<Point<dim> > &
+    const std::vector<Point<dim> > &
     get_unit_support_points () const;    
 
                                     /**
@@ -920,7 +920,7 @@ class FiniteElementBase : public Subscriptor,
                                      * See the class documentation
                                      * for details on support points.
                                      */
-    const typename std::vector<Point<dim-1> > &
+    const std::vector<Point<dim-1> > &
     get_unit_face_support_points () const;    
 
                                     /**
@@ -1303,7 +1303,7 @@ class FiniteElementBase : public Subscriptor,
                                      * support points. In that case,
                                      * this field remains empty.
                                      */
-    typename std::vector<Point<dim> > unit_support_points;
+    std::vector<Point<dim> > unit_support_points;
 
                                     /**
                                      * Same for the faces. See the
@@ -1313,7 +1313,7 @@ class FiniteElementBase : public Subscriptor,
                                      * what contributes a face
                                      * support point.
                                      */
-    typename std::vector<Point<dim-1> > unit_face_support_points;
+    std::vector<Point<dim-1> > unit_face_support_points;
 
                                     /**
                                      * For each shape function, give
index 5393e2aa27957bd0e24fd3ac2f97a38bd881c0d5..1e30f5069895766a6b53dc69263e2132594aeef9 100644 (file)
@@ -426,7 +426,7 @@ class FE_DGP : public FiniteElement<dim>
                                          * multiplication) when
                                          * visiting an actual cell.
                                          */                                  
-       typename std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
+       std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
     };
     
                                     /**
index 84afc997bba302c73fa8f0fcaffbc59622eb3e4e..de35097d631f71471b3c4eb2301ab05322c71bfc 100644 (file)
@@ -454,7 +454,7 @@ class FE_DGQ : public FiniteElement<dim>
                                          * multiplication) when
                                          * visiting an actual cell.
                                          */                                  
-       typename std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
+       std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
     };
     
                                     /**
index 6c5717e2a42976079ccf3b16885699e12988acbe..c8590d2d7faa8defaeb4b862888c6ff470d226df 100644 (file)
@@ -458,7 +458,7 @@ class FE_Nedelec : public FiniteElement<dim>
                                          * multiplication) when
                                          * visiting an actual cell.
                                          */
-       typename std::vector<typename std::vector<Tensor<2,dim> > > shape_gradients;
+       std::vector<std::vector<Tensor<2,dim> > > shape_gradients;
     };
     
                                     /**
index ad5b786f014141ad83e6f2dcb15caefd1582fce6..b1d8a9e46c4060fbe7dc62c56efea218a7ebb45b 100644 (file)
@@ -799,7 +799,7 @@ class FE_Q : public FiniteElement<dim>
                                          * multiplication) when
                                          * visiting an actual cell.
                                          */      
-       typename std::vector<typename std::vector<Tensor<1,dim> > > shape_gradients;
+       std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
     };
     
                                     /**
index 663c8a925eccbce53c5f5e1a6e283c198cff960f..04f164a91ffce324b90f22132056d13ba25199e3 100644 (file)
@@ -452,7 +452,7 @@ class FESystem : public FiniteElement<dim>
                                      * Pairs of multiplicity and
                                      * element type.
                                      */
-    typedef typename std::pair<const FiniteElement<dim> *, unsigned int> ElementPair;
+    typedef std::pair<const FiniteElement<dim> *, unsigned int> ElementPair;
     
                                     /**
                                      * Pointer to underlying finite
@@ -465,7 +465,7 @@ class FESystem : public FiniteElement<dim>
                                      * created by the constructor and
                                      * constant afterwards.
                                      */
-    typename std::vector<ElementPair> base_elements;
+    std::vector<ElementPair> base_elements;
 
 
                                     /**
@@ -772,7 +772,7 @@ class FESystem : public FiniteElement<dim>
                                          * by the InternalData
                                          * constructor.
                                          */
-       typename std::vector<FEValuesData<dim> *> base_fe_values_datas;
+       std::vector<FEValuesData<dim> *> base_fe_values_datas;
     };
 };
 
index 4ae07bcce3d89f8d0465183003d50304b0df9395..5f4532419d3b6c3a922ac4ebc9b71e79e1d36da4 100644 (file)
@@ -103,7 +103,7 @@ class FEValuesData
                                      * @ref{ShapeVector} data type.
                                      */
     typedef
-    typename std::vector<typename std::vector<Tensor<1,dim> > >
+    std::vector<std::vector<Tensor<1,dim> > >
     GradientVector;
 
                                     /**
@@ -111,7 +111,7 @@ class FEValuesData
                                      * derivatives.
                                      */
     typedef
-    typename std::vector<typename std::vector<Tensor<2,dim> > >
+    std::vector<std::vector<Tensor<2,dim> > >
     GradGradVector;
     
                                     /**
@@ -165,21 +165,21 @@ class FEValuesData
                                      * real element, rather than on the
                                      * reference element.
                                      */
-    typename std::vector<Point<dim> >  quadrature_points;
+    std::vector<Point<dim> >  quadrature_points;
 
                                     /**
                                      * List of outward normal vectors at the
                                      * quadrature points. This field is filled
                                      * in by the finite element class.
                                      */
-    typename std::vector<Point<dim> >  normal_vectors;
+    std::vector<Point<dim> >  normal_vectors;
 
                                      /**
                                      * List of boundary forms at the
                                      * quadrature points. This field is filled
                                      * in by the finite element class.
                                      */
-    typename std::vector<Tensor<1,dim> >  boundary_forms;
+    std::vector<Tensor<1,dim> >  boundary_forms;
 
                                     /**
                                      * Indicate the first row which a
@@ -442,7 +442,7 @@ class FEValuesBase : protected FEValuesData<dim>
                                      */
     template <class InputVector, typename number>
     void get_function_values (const InputVector& fe_function,
-                             typename std::vector<number>& values) const;
+                             std::vector<number>& values) const;
 
                                     /**
                                      * Access to vector valued finite
@@ -462,7 +462,7 @@ class FEValuesBase : protected FEValuesData<dim>
                                      */
     template <class InputVector, typename number>
     void get_function_values (const InputVector       &fe_function,
-                             typename std::vector<Vector<number> > &values) const;
+                             std::vector<Vector<number> > &values) const;
 
                                     /**
                                      * Gradient of the @p{i}th shape
@@ -547,7 +547,7 @@ class FEValuesBase : protected FEValuesData<dim>
                                      */
     template <class InputVector>
     void get_function_grads (const InputVector      &fe_function,
-                            typename std::vector<Tensor<1,dim> > &gradients) const;
+                            std::vector<Tensor<1,dim> > &gradients) const;
 
                                     /**
                                      * Return the gradients of the finite
@@ -576,7 +576,7 @@ class FEValuesBase : protected FEValuesData<dim>
                                      */
     template <class InputVector>
     void get_function_grads (const InputVector               &fe_function,
-                            typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const;
+                            std::vector<std::vector<Tensor<1,dim> > > &gradients) const;
 
                                     /**
                                      * 2nd derivatives of
@@ -663,7 +663,7 @@ class FEValuesBase : protected FEValuesData<dim>
                                      */
     template <class InputVector>
     void get_function_2nd_derivatives (const InputVector& fe_function,
-                                      typename std::vector<Tensor<2,dim> >& second_derivatives) const;
+                                      std::vector<Tensor<2,dim> >& second_derivatives) const;
 
     
                                     /**
@@ -690,7 +690,7 @@ class FEValuesBase : protected FEValuesData<dim>
                                      */
     template <class InputVector>
     void get_function_2nd_derivatives (const InputVector      &fe_function,
-                                      typename std::vector<typename std::vector<Tensor<2,dim> > > &second_derivatives) const;
+                                      std::vector<std::vector<Tensor<2,dim> > > &second_derivatives) const;
     
                                     /**
                                      * Position of the @p{i}th
@@ -702,7 +702,7 @@ class FEValuesBase : protected FEValuesData<dim>
                                      * Return a pointer to the vector of
                                      * quadrature points.
                                      */
-    const typename std::vector<Point<dim> > & get_quadrature_points () const;
+    const std::vector<Point<dim> > & get_quadrature_points () const;
 
                                     /**
                                      * Mapped quadrature weight. This
@@ -995,13 +995,13 @@ class FEFaceValuesBase : public FEValuesBase<dim>
                                      * vectors to the cell at the
                                      * quadrature points.
                                      */
-    const typename std::vector<Point<dim> > & get_normal_vectors () const;
+    const std::vector<Point<dim> > & get_normal_vectors () const;
 
                                     /**
                                      * Return the list of outward normal
                                      * vectors times quadrature weights.
                                      */
-    const typename std::vector<Tensor<1,dim> > & get_boundary_forms () const;
+    const std::vector<Tensor<1,dim> > & get_boundary_forms () const;
 
                                     /**
                                      * Return the present
index d8993859bb3b99559e5a1b0b3a98df4727d393af..92c69298cbc7bb2d58525b1f215d00646fcb220a 100644 (file)
@@ -345,7 +345,7 @@ class Mapping : public Subscriptor
     fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>                         &quadrature,
                    InternalDataBase                              &internal,
-                   typename std::vector<Point<dim> >             &quadrature_points,
+                   std::vector<Point<dim> >             &quadrature_points,
                    std::vector<double>                           &JxW_values) const = 0;
 
                                     /**
@@ -374,10 +374,10 @@ class Mapping : public Subscriptor
                         const unsigned int                        face_no,
                         const Quadrature<dim-1>                  &quadrature,
                         InternalDataBase                         &internal,
-                        typename std::vector<Point<dim> >        &quadrature_points,
+                        std::vector<Point<dim> >        &quadrature_points,
                         std::vector<double>                      &JxW_values,
-                        typename std::vector<Tensor<1,dim> >     &boundary_form,
-                        typename std::vector<Point<dim> >        &normal_vectors) const = 0;
+                        std::vector<Tensor<1,dim> >     &boundary_form,
+                        std::vector<Point<dim> >        &normal_vectors) const = 0;
 
                                     /**
                                      * See above.
@@ -388,10 +388,10 @@ class Mapping : public Subscriptor
                            const unsigned int                        sub_no,
                            const Quadrature<dim-1>                  &quadrature,
                            InternalDataBase                         &internal,
-                           typename std::vector<Point<dim> >        &quadrature_points,
+                           std::vector<Point<dim> >        &quadrature_points,
                            std::vector<double>                      &JxW_values,
-                           typename std::vector<Tensor<1,dim> >     &boundary_form,
-                           typename std::vector<Point<dim> >        &normal_vectors) const = 0;
+                           std::vector<Tensor<1,dim> >     &boundary_form,
+                           std::vector<Point<dim> >        &normal_vectors) const = 0;
 
                                     /**
                                      * Give class @p{FEValues} access
index 92a56d66fddb31be15d2d6b7bf5d1deec164ba72..dd092c989ecc12d8768a3f5cde5f26df18deb12e 100644 (file)
@@ -72,7 +72,7 @@ class MappingC1 : public MappingQ<dim>
                                      */
     virtual void
     add_line_support_points (const typename Triangulation<dim>::cell_iterator &cell,
-                            typename std::vector<Point<dim> > &a) const;
+                            std::vector<Point<dim> > &a) const;
 
                                     /**
                                      * For @p{dim=3}. Append the
@@ -98,7 +98,7 @@ class MappingC1 : public MappingQ<dim>
                                      */
     virtual void
     add_quad_support_points(const typename Triangulation<dim>::cell_iterator &cell,
-                           typename std::vector<Point<dim> > &a) const;
+                           std::vector<Point<dim> > &a) const;
 };
 
 
index 558a3cb6a19cebcd7ac8533cb25ba3c05aac3caf..e08d594c4114a6e2bda37ef4b0f4ca9695098334 100644 (file)
@@ -67,7 +67,7 @@ class MappingCartesian : public Mapping<dim>
     fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                    const Quadrature<dim>& quadrature,
                    typename Mapping<dim>::InternalDataBase &mapping_data,
-                   typename std::vector<Point<dim> >        &quadrature_points,
+                   std::vector<Point<dim> >        &quadrature_points,
                    std::vector<double>             &JxW_values) const ;
 
                                     /**
@@ -79,10 +79,10 @@ class MappingCartesian : public Mapping<dim>
                         const unsigned int face_no,
                         const Quadrature<dim-1>& quadrature,
                         typename Mapping<dim>::InternalDataBase &mapping_data,
-                        typename std::vector<Point<dim> >        &quadrature_points,
+                        std::vector<Point<dim> >        &quadrature_points,
                         std::vector<double>             &JxW_values,
-                        typename std::vector<Tensor<1,dim> >        &boundary_form,
-                        typename std::vector<Point<dim> >        &normal_vectors) const ;
+                        std::vector<Tensor<1,dim> >        &boundary_form,
+                        std::vector<Point<dim> >        &normal_vectors) const ;
 
                                     /**
                                      * Implementation of the interface in
@@ -94,10 +94,10 @@ class MappingCartesian : public Mapping<dim>
                            const unsigned int sub_no,
                            const Quadrature<dim-1>& quadrature,
                            typename Mapping<dim>::InternalDataBase &mapping_data,
-                           typename std::vector<Point<dim> >        &quadrature_points,
+                           std::vector<Point<dim> >        &quadrature_points,
                            std::vector<double>             &JxW_values,
-                           typename std::vector<Tensor<1,dim> >        &boundary_form,
-                           typename std::vector<Point<dim> >        &normal_vectors) const ;
+                           std::vector<Tensor<1,dim> >        &boundary_form,
+                           std::vector<Point<dim> >        &normal_vectors) const ;
 
 
                                     /**
@@ -116,9 +116,9 @@ class MappingCartesian : public Mapping<dim>
                                      */
     virtual void
     transform_contravariant (typename std::vector<Tensor<1,dim> >::iterator begin,
-                        typename std::vector<Tensor<1,dim> >::const_iterator end,
-                        typename std::vector<Tensor<1,dim> >::const_iterator src,
-                        const typename Mapping<dim>::InternalDataBase &mapping_data) const;
+                            typename std::vector<Tensor<1,dim> >::const_iterator end,
+                            typename std::vector<Tensor<1,dim> >::const_iterator src,
+                            const typename Mapping<dim>::InternalDataBase &mapping_data) const;
 
                                     /**
                                      * Transforms the point @p{p} on
@@ -162,7 +162,6 @@ class MappingCartesian : public Mapping<dim>
     DeclException0 (ExcInvalidData);
 
   protected:
-
                                     /** 
                                      * Storage for internal data of
                                      * d-linear transformation.
@@ -196,7 +195,7 @@ class MappingCartesian : public Mapping<dim>
                                          * points. Especially, all
                                          * points of all faces.
                                          */
-       typename std::vector<Point<dim> > quadrature_points;
+       std::vector<Point<dim> > quadrature_points;
        
                                         /**
                                          * Unit tangential vectors. Used
@@ -206,12 +205,12 @@ class MappingCartesian : public Mapping<dim>
                                          *
                                          * Filled once.
                                          */
-        typename std::vector<typename std::vector<Tensor<1,dim> > > unit_tangentials;
+        std::vector<std::vector<Tensor<1,dim> > > unit_tangentials;
        
                                         /**
                                          * Auxiliary vectors for internal use.
                                          */
-        typename std::vector<typename std::vector<Tensor<1,dim> > > aux;
+        std::vector<std::vector<Tensor<1,dim> > > aux;
     };
     
                                     /**
@@ -222,8 +221,8 @@ class MappingCartesian : public Mapping<dim>
                       const unsigned int face_no,
                       const unsigned int sub_no,
                       InternalData& data,
-                      typename std::vector<Point<dim> > &quadrature_points,
-                      typename std::vector<Point<dim> >& normal_vectors) const;
+                      std::vector<Point<dim> > &quadrature_points,
+                      std::vector<Point<dim> >& normal_vectors) const;
 
   private:
                                     /**
index 8608ab103ff838531fc7849c6952fc4ead003055..bf1934d62c10e59d929174cc48776600b7ac69c1 100644 (file)
@@ -94,9 +94,9 @@ class MappingQ : public MappingQ1<dim>
                                      */
     virtual void
     transform_contravariant (typename std::vector<Tensor<1,dim> >::iterator begin,
-                        typename std::vector<Tensor<1,dim> >::const_iterator end,
-                        typename std::vector<Tensor<1,dim> >::const_iterator src,
-                        const typename Mapping<dim>::InternalDataBase &mapping_data) const;    
+                            typename std::vector<Tensor<1,dim> >::const_iterator end,
+                            typename std::vector<Tensor<1,dim> >::const_iterator src,
+                            const typename Mapping<dim>::InternalDataBase &mapping_data) const;    
 
                                     /**
                                      * Return the degree of the
@@ -137,7 +137,7 @@ class MappingQ : public MappingQ1<dim>
                                          * Filled (hardcoded) once in
                                          * @p{get_face_data}.
                                          */
-        typename std::vector<typename std::vector<Point<dim> > > unit_normals;
+        std::vector<std::vector<Point<dim> > > unit_normals;
 
                                         /**
                                          * Flag that is set by the
@@ -225,7 +225,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
     virtual void
     add_line_support_points (const typename Triangulation<dim>::cell_iterator &cell,
-                            typename std::vector<Point<dim> > &a) const;
+                            std::vector<Point<dim> > &a) const;
 
                                     /**
                                      * For @p{dim=3}. Append the
@@ -252,7 +252,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
     virtual void
     add_quad_support_points(const typename Triangulation<dim>::cell_iterator &cell,
-                           typename std::vector<Point<dim> > &a) const;
+                           std::vector<Point<dim> > &a) const;
     
   private:
     
@@ -288,7 +288,7 @@ class MappingQ : public MappingQ1<dim>
                                      * derivatives.
                                      */
     virtual void
-    compute_shapes_virtual (const typename std::vector<Point<dim> > &unit_points,
+    compute_shapes_virtual (const std::vector<Point<dim> > &unit_points,
                            typename MappingQ1<dim>::InternalData &data) const;
 
                                     /**
@@ -345,7 +345,7 @@ class MappingQ : public MappingQ1<dim>
                                      * points are appended.
                                      */
     void apply_laplace_vector(const std::vector<std::vector<double> > &lvs,
-                             typename std::vector<Point<dim> > &a) const;
+                             std::vector<Point<dim> > &a) const;
     
                                     /**
                                      * Computes the support points of
@@ -353,7 +353,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
     virtual void compute_mapping_support_points(
       const typename Triangulation<dim>::cell_iterator &cell,
-      typename std::vector<Point<dim> > &a) const;
+      std::vector<Point<dim> > &a) const;
 
                                     /**
                                      * Computes all support points of
@@ -371,7 +371,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
     void compute_support_points_laplace(
       const typename Triangulation<dim>::cell_iterator &cell,
-      typename std::vector<Point<dim> > &a) const;
+      std::vector<Point<dim> > &a) const;
     
                                     /**
                                      * Simple version of the
@@ -395,7 +395,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
     void compute_support_points_simple(
       const typename Triangulation<dim>::cell_iterator &cell,
-      typename std::vector<Point<dim> > &a) const;    
+      std::vector<Point<dim> > &a) const;    
     
                                     /**
                                      * For @p{dim=2} and 3. Simple
@@ -408,7 +408,7 @@ class MappingQ : public MappingQ1<dim>
                                      */
 //TODO:[RH] (later) remove this function altogether?    
     void fill_quad_support_points_simple (const typename Triangulation<dim>::cell_iterator &cell,
-                                         typename std::vector<Point<dim> > &a) const;
+                                         std::vector<Point<dim> > &a) const;
     
                                     /**
                                      * Needed by the
index 9492e290a1e2f1343548643192655de4ef06075e..13fb8dab1acdc528bbe8233b87ea0c507bfd91a6 100644 (file)
@@ -233,7 +233,7 @@ class MappingQ1 : public Mapping<dim>
                                          *
                                          * Computed once.
                                          */
-       typename std::vector<Tensor<1,dim> > shape_derivatives;
+       std::vector<Tensor<1,dim> > shape_derivatives;
        
                                         /**
                                          * Tensors of covariant
@@ -241,7 +241,7 @@ class MappingQ1 : public Mapping<dim>
                                          *
                                          * Computed on each cell.
                                          */
-       typename std::vector<Tensor<2,dim> > covariant;
+       std::vector<Tensor<2,dim> > covariant;
        
                                         /**
                                          * Tensors of covariant
@@ -249,7 +249,7 @@ class MappingQ1 : public Mapping<dim>
                                          *
                                          * Computed on each cell.
                                          */
-       typename std::vector<Tensor<2,dim> > contravariant;
+       std::vector<Tensor<2,dim> > contravariant;
        
                                         /**
                                          * Unit tangential vectors. Used
@@ -259,19 +259,19 @@ class MappingQ1 : public Mapping<dim>
                                          *
                                          * Filled once.
                                          */
-        typename std::vector<typename std::vector<Tensor<1,dim> > > unit_tangentials;
+        std::vector<std::vector<Tensor<1,dim> > > unit_tangentials;
        
                                         /**
                                          * Auxuliary vectors for internal use.
                                          */
-        typename std::vector<typename std::vector<Tensor<1,dim> > > aux;
+        std::vector<std::vector<Tensor<1,dim> > > aux;
 
                                         /**
                                          * Stores the support points of
                                          * the mapping shape functions on
                                          * the @p{cell_of_current_support_points}.
                                          */
-       typename std::vector<Point<dim> > mapping_support_points;
+       std::vector<Point<dim> > mapping_support_points;
        
                                         /**
                                          * Stores the cell of which the
@@ -359,7 +359,7 @@ class MappingQ1 : public Mapping<dim>
                                      * @p{data.is_mapping_q1_data}
                                      * equals @p{true} or @p{false}.
                                      */
-    void compute_shapes (const typename std::vector<Point<dim> > &unit_points,
+    void compute_shapes (const std::vector<Point<dim> > &unit_points,
                         InternalData &data) const;
 
                                     /**
@@ -400,7 +400,7 @@ class MappingQ1 : public Mapping<dim>
                       const unsigned int   npts,
                       const unsigned int   offset,
                       InternalData        &data,
-                      typename std::vector<Point<dim> > &quadrature_points) const;
+                      std::vector<Point<dim> > &quadrature_points) const;
     
                                     /**
                                      * Do the computation for the
@@ -413,16 +413,16 @@ class MappingQ1 : public Mapping<dim>
                            const unsigned int      offset,
                            const std::vector<double>   &weights,
                            InternalData           &mapping_data,
-                           typename std::vector<Point<dim> >    &quadrature_points,
+                           std::vector<Point<dim> >    &quadrature_points,
                            std::vector<double>         &JxW_values,
-                           typename std::vector<Tensor<1,dim> > &boundary_form,
-                           typename std::vector<Point<dim> > &normal_vectors) const;
+                           std::vector<Tensor<1,dim> > &boundary_form,
+                           std::vector<Point<dim> > &normal_vectors) const;
     
                                     /**
                                      * Compute shape values and/or
                                      * derivatives.
                                      */
-    virtual void compute_shapes_virtual (const typename std::vector<Point<dim> > &unit_points,
+    virtual void compute_shapes_virtual (const std::vector<Point<dim> > &unit_points,
                                         InternalData &data) const;
 
                                     /**
@@ -535,7 +535,7 @@ class MappingQ1 : public Mapping<dim>
                                      */
     virtual void compute_mapping_support_points(
       const typename Triangulation<dim>::cell_iterator &cell,
-      typename std::vector<Point<dim> > &a) const;
+      std::vector<Point<dim> > &a) const;
 
                                     /**
                                      * Number of shape functions. Is
index 029cee15be6cc41ad35323f947c4ff71b625be8b..003cc106154458ebb4d308a016b562b03b1e51f2 100644 (file)
@@ -144,7 +144,7 @@ class MappingQ1Eulerian : public MappingQ1<dim>
                                      */
     virtual void compute_mapping_support_points(
       const typename Triangulation<dim>::cell_iterator &cell,
-      typename std::vector<Point<dim> > &a) const;
+      std::vector<Point<dim> > &a) const;
     
 };
 
index 3c7daf17ddc9967eda7973e971933198d260327c..bf499668574a79e7a7e1358e4d60aedd47973bff 100644 (file)
@@ -500,7 +500,7 @@ class GridGenerator
                                      */
     template <int dim>
     static void laplace_transformation (Triangulation<dim> &tria,
-                                       const typename std::map<unsigned int,Point<dim> > &new_points);
+                                       const std::map<unsigned int,Point<dim> > &new_points);
 
                                     /**
                                      * Declaration of same function
index b920d29d0a93ddb78eb7bbd6a18bf24f6abce770..a245bffaf38bdaa1013489361e1607d7db744ada 100644 (file)
@@ -257,8 +257,8 @@ class GridIn
                                      * have to eliminate unused
                                      * vertices beforehand.
                                      */
-    static void delete_unused_vertices (typename std::vector<Point<dim> >    &vertices,
-                                       typename std::vector<CellData<dim> > &cells,
+    static void delete_unused_vertices (std::vector<Point<dim> >    &vertices,
+                                       std::vector<CellData<dim> > &cells,
                                        SubCellData                          &subcelldata);
 
                                     /**
@@ -306,8 +306,8 @@ class GridIn
                                      * without further ado by the
                                      * user.
                                      */
-    static void debug_output_grid (const typename std::vector<CellData<dim> > &cells,
-                                  const typename std::vector<Point<dim> >    &vertices,
+    static void debug_output_grid (const std::vector<CellData<dim> > &cells,
+                                  const std::vector<Point<dim> >    &vertices,
                                   std::ostream                               &out);
 };
 
index 733cc26509d4a8d7608d71c95fb92572b220fd90..b597e0e85127069b88df500535adcc1d94807d21 100644 (file)
@@ -526,7 +526,7 @@ class GridReordering : private GridReorderingInfo<dim>
                                      * general documentation of this
                                      * class.
                                      */
-    static void reorder_cells (typename std::vector<CellData<dim> > &original_cells);
+    static void reorder_cells (std::vector<CellData<dim> > &original_cells);
     
   private:
 
@@ -689,7 +689,7 @@ class GridReordering : private GridReorderingInfo<dim>
                                          * @p{adjacent_cells} field
                                          * of the inserted faces.
                                          */
-       void insert_faces (typename std::map<Face,FaceData > &global_faces);
+       void insert_faces (std::map<Face,FaceData > &global_faces);
 
                                         /**
                                          * Find out the neighbors of the
@@ -878,11 +878,11 @@ class GridReordering : private GridReorderingInfo<dim>
                                      * as recursive calls but rather
                                      * as eliminated tail-recursion.
                                      */
-    static void track_back (typename std::vector<Cell>  &cells,
+    static void track_back (std::vector<Cell>  &cells,
                            RotationStack               &rotation_states,
                            const unsigned int          track_back_to_cell);
 
-    static bool try_rotate_single_neighbors (typename std::vector<Cell>  &cells,
+    static bool try_rotate_single_neighbors (std::vector<Cell>  &cells,
                                             RotationStack               &rotation_states);
     
                                     /**
@@ -902,8 +902,8 @@ class GridReordering : private GridReorderingInfo<dim>
                                      * between original cells and
                                      * presorted cells.
                                      */
-    static void find_reordering (typename std::vector<Cell>           &cells,
-                                typename std::vector<CellData<dim> > &original_cells,
+    static void find_reordering (std::vector<Cell>           &cells,
+                                std::vector<CellData<dim> > &original_cells,
                                 const std::vector<unsigned int>      &new_cell_numbers);
 
                                     /**
@@ -919,8 +919,8 @@ class GridReordering : private GridReorderingInfo<dim>
                                      */
     static
     std::vector<unsigned int>
-    presort_cells (typename std::vector<Cell>       &cells,
-                  typename std::map<Face,FaceData> &faces);
+    presort_cells (std::vector<Cell>       &cells,
+                  std::map<Face,FaceData> &faces);
 
                                     /** 
                                      * By the resolution of Defect
index 0d8686223b0cdef2405b4d9f01ced911051f4b0c..1f5f5b91047c369923d23799d8c17d9a5f913380 100644 (file)
@@ -206,7 +206,7 @@ class InterGridMap
                                      * The actual data. Hold one iterator
                                      * for each cell on each level.
                                      */
-    typename std::vector<typename std::vector<cell_iterator> > mapping;
+    std::vector<std::vector<cell_iterator> > mapping;
 
                                     /**
                                      * Store a pointer to the source grid.
index 95b62111fb047526a735a3398aa169bdcd525677..46c75a9f857acc8b002858811c54fd0a6700731d 100644 (file)
@@ -214,8 +214,8 @@ class PersistentTriangulation : public Triangulation<dim>
                                      * is not useful in the context of this
                                      * class.
                                      */
-    virtual void create_triangulation (const typename std::vector<Point<dim> >    &vertices,
-                                      const typename std::vector<CellData<dim> > &cells,
+    virtual void create_triangulation (const std::vector<Point<dim> >    &vertices,
+                                      const std::vector<CellData<dim> > &cells,
                                       const SubCellData                          &subcelldata);
 
                                     /**
index 490c6452c7b52ca54bd2c8b88ade42177aafa438..8c1f956e82bb118ff103993358c929a96f6050e5 100644 (file)
@@ -1851,8 +1851,8 @@ class Triangulation : public TriaDimensionInfo<dim>,
                                      * and the @ref{GridIn} and
                                      * @ref{GridReordering} class.
                                      */
-    virtual void create_triangulation (const typename std::vector<Point<dim> >    &vertices,
-                                      const typename std::vector<CellData<dim> > &cells,
+    virtual void create_triangulation (const std::vector<Point<dim> >    &vertices,
+                                      const std::vector<CellData<dim> > &cells,
                                       const SubCellData                          &subcelldata);
 
                                     /**
@@ -2941,7 +2941,7 @@ class Triangulation : public TriaDimensionInfo<dim>,
                                      * function
                                      * @ref{get_used_vertices}.
                                      */
-    const typename std::vector<Point<dim> > &
+    const std::vector<Point<dim> > &
     get_vertices () const;
     
                                     /**
@@ -3241,13 +3241,13 @@ class Triangulation : public TriaDimensionInfo<dim>,
                                      *
                                      *  Usage is like @p{levels[3]->quads}.
                                      */
-    typename std::vector<TriangulationLevel<dim>*> levels;
+    std::vector<TriangulationLevel<dim>*> levels;
 
                                     /**
                                      *  Array of the vertices of this
                                      *  triangulation.
                                      */
-    typename std::vector<Point<dim> >              vertices;
+    std::vector<Point<dim> >              vertices;
 
                                     /**
                                      *  Array storing a bit-pattern which
index a4198e6d33a5877ff7d941421fbde9ddab7a1f69..2dad306bbaac3221e1b2528fffc86d09bebbb796 100644 (file)
@@ -179,7 +179,7 @@ class Boundary : public Subscriptor
                                      */
     virtual void
     get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
     
                                     /**
                                      * Return equally spaced
@@ -213,7 +213,7 @@ class Boundary : public Subscriptor
                                      */
     virtual void
     get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Compute the normal vectors to
@@ -333,7 +333,7 @@ class StraightBoundary : public Boundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Gives @p{n=points.size()=m*m}
@@ -349,7 +349,7 @@ class StraightBoundary : public Boundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Compute the normals to the
index fd60b0e5a31eb72846a32bad2ebed3d0744aeccf..ae737bba24e0881faa2087e80a2826a65fc5c2be 100644 (file)
@@ -71,7 +71,7 @@ class CylinderBoundary : public StraightBoundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Refer to the general
@@ -84,7 +84,7 @@ class CylinderBoundary : public StraightBoundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Compute the normals to the
@@ -135,7 +135,7 @@ class CylinderBoundary : public StraightBoundary<dim>
                                      * base class.
                                      */
     void get_intermediate_points_between_points (const Point<dim> &p0, const Point<dim> &p1,
-                                                typename std::vector<Point<dim> > &points) const;    
+                                                std::vector<Point<dim> > &points) const;    
 };
 
 
@@ -192,7 +192,7 @@ class HyperBallBoundary : public StraightBoundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Refer to the general
@@ -205,7 +205,7 @@ class HyperBallBoundary : public StraightBoundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Compute the normals to the
@@ -286,7 +286,7 @@ class HyperBallBoundary : public StraightBoundary<dim>
                                      * base class.
                                      */
     void get_intermediate_points_between_points (const Point<dim> &p0, const Point<dim> &p1,
-                                                typename std::vector<Point<dim> > &points) const;    
+                                                std::vector<Point<dim> > &points) const;    
 };
 
 
@@ -338,7 +338,7 @@ class HalfHyperBallBoundary : public HyperBallBoundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Refer to the general
@@ -351,7 +351,7 @@ class HalfHyperBallBoundary : public HyperBallBoundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Compute the normals to the
@@ -442,7 +442,7 @@ class HalfHyperShellBoundary : public HyperShellBoundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Refer to the general
@@ -455,7 +455,7 @@ class HalfHyperShellBoundary : public HyperShellBoundary<dim>
                                      */
     virtual void
     get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                    typename std::vector<Point<dim> > &points) const;
+                                    std::vector<Point<dim> > &points) const;
 
                                     /**
                                      * Compute the normals to the
index 625cb14a84af2d7fea7d5b1c68418f43bb8643b1..187eb4e1f057c9248d8e4f5a81ed2a2057f8e021 100644 (file)
@@ -101,7 +101,7 @@ class MGLevelObject : public Subscriptor
                                     /**
                                      * Array of the objects to be held.
                                      */
-    typename std::vector<Object> objects;
+    std::vector<Object> objects;
 };
 
 
index 97ab8d04895d3ffa5c98669fe346ef15a78bd2f4..570361db70e84e9125ae4eb94468658e6b5d1ee7 100644 (file)
@@ -1050,7 +1050,7 @@ class MGDoFHandler : public DoFHandler<dim>
                                      * are numbers which start from
                                      * zero on each level.
                                      */
-    typename std::vector<DoFLevel<dim>*>    mg_levels;
+    std::vector<DoFLevel<dim>*>    mg_levels;
 
                                     /**
                                      * For each vertex there is a
@@ -1059,7 +1059,7 @@ class MGDoFHandler : public DoFHandler<dim>
                                      * different levels it lives on
                                      * and which are these levels.
                                      */
-    typename std::vector<MGVertexDoFs>      mg_vertex_dofs;
+    std::vector<MGVertexDoFs>      mg_vertex_dofs;
     
                                     /**
                                      * Vectors storing the number of
index 3c801337043d9ffeca3fc06e81c62c1036c3be4e..f9a8cda4d2fa5b846fc88c2849222d2f5161740f 100644 (file)
@@ -475,13 +475,13 @@ class DataOut_DoFData : public DataOutInterface<patch_dim,patch_space_dim>
                                      * List of data elements with vectors of
                                      * values for each degree of freedom.
                                      */
-    typename std::vector<DataEntry>  dof_data;
+    std::vector<DataEntry>  dof_data;
 
                                     /**
                                      * List of data elements with vectors of
                                      * values for each cell.
                                      */
-    typename std::vector<DataEntry>  cell_data;
+    std::vector<DataEntry>  cell_data;
 
                                     /**
                                      * This is a list of patches that is
@@ -490,7 +490,7 @@ class DataOut_DoFData : public DataOutInterface<patch_dim,patch_space_dim>
                                      * in the output routines of the base
                                      * classes.
                                      */
-    typename std::vector<Patch> patches;
+    std::vector<Patch> patches;
 
                                     /**
                                      * Function by which the base
@@ -498,7 +498,7 @@ class DataOut_DoFData : public DataOutInterface<patch_dim,patch_space_dim>
                                      * what patches they shall write
                                      * to a file.
                                      */
-    virtual const typename std::vector<Patch> &
+    virtual const std::vector<Patch> &
     get_patches () const;
 
                                     /**
index 133acce8fc472a4b337142ee65e3dc4e26ae3497..b4b47b9a2e583cc2e656133ce248066d5bdc7bde 100644 (file)
@@ -367,7 +367,7 @@ class DataOutStack : public DataOutInterface<dim+1>
                                      * List of patches of all past and
                                      * present parameter value data sets.
                                      */
-    typename std::vector< ::DataOutBase::Patch<dim+1> >   patches;
+    std::vector< ::DataOutBase::Patch<dim+1> >   patches;
 
                                     /**
                                      * Structure holding data vectors
@@ -398,12 +398,12 @@ class DataOutStack : public DataOutInterface<dim+1>
                                     /**
                                      * List of DoF data vectors.
                                      */
-    typename std::vector<DataVector> dof_data;
+    std::vector<DataVector> dof_data;
 
                                     /**
                                      * List of cell data vectors.
                                      */
-    typename std::vector<DataVector> cell_data;
+    std::vector<DataVector> cell_data;
     
                                     /**
                                      * This is the function through
@@ -413,7 +413,7 @@ class DataOutStack : public DataOutInterface<dim+1>
                                      * the base class @ref{DataOutBase}) to
                                      * the actual output function.
                                      */
-    virtual const typename std::vector< ::DataOutBase::Patch<dim+1> > & get_patches () const;
+    virtual const std::vector< ::DataOutBase::Patch<dim+1> > & get_patches () const;
 
 
                                     /**
index 959d7d3cdac546fa142a8da35d51b6ecd3cc2444..e46880357a3e67a7a6e79b5f4dfb33f248fc1d4a 100644 (file)
@@ -484,18 +484,18 @@ class KellyErrorEstimator
                                          * index of the solution
                                          * vector.
                                          */
-       typename std::vector<typename std::vector<typename std::vector<Tensor<1,dim> > > > psi;
+       std::vector<std::vector<std::vector<Tensor<1,dim> > > > psi;
 
                                         /**
                                          * The same vector for a neighbor cell
                                          */
-       typename std::vector<typename std::vector<typename std::vector<Tensor<1,dim> > > > neighbor_psi;
+       std::vector<std::vector<std::vector<Tensor<1,dim> > > > neighbor_psi;
 
                                         /**
                                          * The normal vectors of the finite
                                          * element function on one face
                                          */
-       typename std::vector<Point<dim> > normal_vectors;
+       std::vector<Point<dim> > normal_vectors;
 
                                         /**
                                          * Two arrays needed for the
index 759e1726eadaf081db529d534a885299256bd66f..f6979f3f2dad2e069579d7b7f4f508f7198067ca 100644 (file)
@@ -109,7 +109,7 @@ class Histogram
                                      * on this.
                                      */
     template <typename number>
-    void evaluate (const typename std::vector<Vector<number> > &values,
+    void evaluate (const std::vector<Vector<number> > &values,
                   const std::vector<double>                   &y_values,
                   const unsigned int                           n_intervals,
                   const IntervalSpacing                        interval_spacing = linear);
index 2c3a158c0db1741683715c18061037d935652870..c6c631f0efb0e7d971f73a23780d1afd9ecf143f 100644 (file)
@@ -410,7 +410,7 @@ class MatrixCreator
                                          * Abbreviation for a pair of
                                          * iterators.
                                          */
-       typedef typename std::pair<active_cell_iterator,active_cell_iterator> iterator_pair;
+       typedef std::pair<active_cell_iterator,active_cell_iterator> iterator_pair;
        
                                         /**
                                          * Constructor. Initialize
index 4a9c86c9a9c037f21addbe9115efbdb4c0c7775e..fed9703b9d734a27d2305e171c8e148148530744 100644 (file)
@@ -200,7 +200,7 @@ class SolutionTransfer
                                      * onto the new (refined and/or
                                      * coarsenend) grid.
                                      */
-    void prepare_for_coarsening_and_refinement (const typename std::vector<Vector<number> > &all_in);
+    void prepare_for_coarsening_and_refinement (const std::vector<Vector<number> > &all_in);
     
                                     /**
                                      * Same as previous function
@@ -264,8 +264,8 @@ class SolutionTransfer
                                      * several functions can be
                                      * performed in one step.
                                      */
-    void interpolate (const typename std::vector<Vector<number> >&all_in,
-                     typename std::vector<Vector<number> >      &all_out) const;
+    void interpolate (const std::vector<Vector<number> >&all_in,
+                     std::vector<Vector<number> >      &all_out) const;
       
                                     /**
                                      * Same as the previous function.
@@ -392,7 +392,7 @@ class SolutionTransfer
        unsigned int memory_consumption () const;
        
        std::vector<unsigned int>    *indices_ptr;
-       typename std::vector<Vector<number> > *dof_values_ptr;
+       std::vector<Vector<number> > *dof_values_ptr;
     };
 
                                     /**
@@ -404,7 +404,7 @@ class SolutionTransfer
                                      * collecting all these structures in a vector
                                      * helps avoiding fraqmentation of the memory.
                                      */
-    typename std::vector<Pointerstruct> all_pointerstructs;
+    std::vector<Pointerstruct> all_pointerstructs;
 
                                     /**
                                      * Is used for
@@ -413,7 +413,7 @@ class SolutionTransfer
                                      * of all cells that'll be coarsened
                                      * will be stored in this vector.
                                      */
-    typename std::vector<typename std::vector<Vector<number> > > dof_values_on_cell;
+    std::vector<std::vector<Vector<number> > > dof_values_on_cell;
 };
 
 
index 640d4593c8913b6eae16873ae287f50be4287ddb..8ef232d15d513e4c7bc17396558a3b87c3a98909 100644 (file)
@@ -2368,7 +2368,7 @@ template <int dim>
 void
 DoFTools::map_dofs_to_support_points (const Mapping<dim>       &mapping,
                                      const DoFHandler<dim>    &dof_handler,
-                                     typename std::vector<Point<dim> > &support_points)
+                                     std::vector<Point<dim> > &support_points)
 {
   const unsigned int dofs_per_cell = dof_handler.get_fe().dofs_per_cell;
   
index 78fd5c6fe2da95b14921ac650e9475a74960e078..e703e0868a0ead2cd653a07b11f92991340637c2 100644 (file)
@@ -327,7 +327,7 @@ bool FiniteElementBase<dim>::operator == (const FiniteElementBase<dim> &f) const
 
 
 template <int dim>
-const typename std::vector<Point<dim> > &
+const std::vector<Point<dim> > &
 FiniteElementBase<dim>::get_unit_support_points () const
 {
                                   // a finite element may define
@@ -352,7 +352,7 @@ FiniteElementBase<dim>::has_support_points () const
 
 
 template <int dim>
-const typename std::vector<Point<dim-1> > &
+const std::vector<Point<dim-1> > &
 FiniteElementBase<dim>::get_unit_face_support_points () const
 {
                                   // a finite element may define
index 04828b1536fb8723f0d4025c7290e69bd6e2cb15..1a9b149e42fb740618fc1559e350b73974efdb07 100644 (file)
@@ -142,12 +142,12 @@ const double * const
 FE_DGP<1>::Matrices::embedding[][GeometryInfo<1>::children_per_cell] =
 {
   {FE_DGP_1d::dgp0_into_dgp0_refined_0, FE_DGP_1d::dgp0_into_dgp0_refined_1},
-    {FE_DGP_1d::dgp1_into_dgp1_refined_0, FE_DGP_1d::dgp1_into_dgp1_refined_1},
-      {FE_DGP_1d::dgp2_into_dgp2_refined_0, FE_DGP_1d::dgp2_into_dgp2_refined_1},
-       {FE_DGP_1d::dgp3_into_dgp3_refined_0, FE_DGP_1d::dgp3_into_dgp3_refined_1},
-         {FE_DGP_1d::dgp4_into_dgp4_refined_0, FE_DGP_1d::dgp4_into_dgp4_refined_1},
-           {FE_DGP_1d::dgp5_into_dgp5_refined_0, FE_DGP_1d::dgp5_into_dgp5_refined_1},
-             {FE_DGP_1d::dgp6_into_dgp6_refined_0, FE_DGP_1d::dgp6_into_dgp6_refined_1}
+  {FE_DGP_1d::dgp1_into_dgp1_refined_0, FE_DGP_1d::dgp1_into_dgp1_refined_1},
+  {FE_DGP_1d::dgp2_into_dgp2_refined_0, FE_DGP_1d::dgp2_into_dgp2_refined_1},
+  {FE_DGP_1d::dgp3_into_dgp3_refined_0, FE_DGP_1d::dgp3_into_dgp3_refined_1},
+  {FE_DGP_1d::dgp4_into_dgp4_refined_0, FE_DGP_1d::dgp4_into_dgp4_refined_1},
+  {FE_DGP_1d::dgp5_into_dgp5_refined_0, FE_DGP_1d::dgp5_into_dgp5_refined_1},
+  {FE_DGP_1d::dgp6_into_dgp6_refined_0, FE_DGP_1d::dgp6_into_dgp6_refined_1}
 };
 
 template <>
index 1ff47cdd834c89b54d9e8225b5dc3e9c036df7ca..ce457e86c13a99e860b48dd3815725f31e73f308 100644 (file)
@@ -478,33 +478,33 @@ const double * const
 FE_DGP<2>::Matrices::embedding[][GeometryInfo<2>::children_per_cell] =
 {
   { FE_DGP_2d::dgp0_into_dgp0_refined_0,
-      FE_DGP_2d::dgp0_into_dgp0_refined_1,
-      FE_DGP_2d::dgp0_into_dgp0_refined_2,
-      FE_DGP_2d::dgp0_into_dgp0_refined_3 },
-    { FE_DGP_2d::dgp1_into_dgp1_refined_0,
-       FE_DGP_2d::dgp1_into_dgp1_refined_1,
-       FE_DGP_2d::dgp1_into_dgp1_refined_2,
-       FE_DGP_2d::dgp1_into_dgp1_refined_3 },
-      { FE_DGP_2d::dgp2_into_dgp2_refined_0,
-         FE_DGP_2d::dgp2_into_dgp2_refined_1,
-         FE_DGP_2d::dgp2_into_dgp2_refined_2,
-         FE_DGP_2d::dgp2_into_dgp2_refined_3 },
-       { FE_DGP_2d::dgp3_into_dgp3_refined_0,
-           FE_DGP_2d::dgp3_into_dgp3_refined_1,
-           FE_DGP_2d::dgp3_into_dgp3_refined_2,
-           FE_DGP_2d::dgp3_into_dgp3_refined_3 },
-         { FE_DGP_2d::dgp4_into_dgp4_refined_0,
-             FE_DGP_2d::dgp4_into_dgp4_refined_1,
-             FE_DGP_2d::dgp4_into_dgp4_refined_2,
-             FE_DGP_2d::dgp4_into_dgp4_refined_3 },
-           { FE_DGP_2d::dgp5_into_dgp5_refined_0,
-               FE_DGP_2d::dgp5_into_dgp5_refined_1,
-               FE_DGP_2d::dgp5_into_dgp5_refined_2,
-               FE_DGP_2d::dgp5_into_dgp5_refined_3 },
-             { FE_DGP_2d::dgp6_into_dgp6_refined_0,
-                 FE_DGP_2d::dgp6_into_dgp6_refined_1,
-                 FE_DGP_2d::dgp6_into_dgp6_refined_2,
-                 FE_DGP_2d::dgp6_into_dgp6_refined_3 }
+    FE_DGP_2d::dgp0_into_dgp0_refined_1,
+    FE_DGP_2d::dgp0_into_dgp0_refined_2,
+    FE_DGP_2d::dgp0_into_dgp0_refined_3 },
+  { FE_DGP_2d::dgp1_into_dgp1_refined_0,
+    FE_DGP_2d::dgp1_into_dgp1_refined_1,
+    FE_DGP_2d::dgp1_into_dgp1_refined_2,
+    FE_DGP_2d::dgp1_into_dgp1_refined_3 },
+  { FE_DGP_2d::dgp2_into_dgp2_refined_0,
+    FE_DGP_2d::dgp2_into_dgp2_refined_1,
+    FE_DGP_2d::dgp2_into_dgp2_refined_2,
+    FE_DGP_2d::dgp2_into_dgp2_refined_3 },
+  { FE_DGP_2d::dgp3_into_dgp3_refined_0,
+    FE_DGP_2d::dgp3_into_dgp3_refined_1,
+    FE_DGP_2d::dgp3_into_dgp3_refined_2,
+    FE_DGP_2d::dgp3_into_dgp3_refined_3 },
+  { FE_DGP_2d::dgp4_into_dgp4_refined_0,
+    FE_DGP_2d::dgp4_into_dgp4_refined_1,
+    FE_DGP_2d::dgp4_into_dgp4_refined_2,
+    FE_DGP_2d::dgp4_into_dgp4_refined_3 },
+  { FE_DGP_2d::dgp5_into_dgp5_refined_0,
+    FE_DGP_2d::dgp5_into_dgp5_refined_1,
+    FE_DGP_2d::dgp5_into_dgp5_refined_2,
+    FE_DGP_2d::dgp5_into_dgp5_refined_3 },
+  { FE_DGP_2d::dgp6_into_dgp6_refined_0,
+    FE_DGP_2d::dgp6_into_dgp6_refined_1,
+    FE_DGP_2d::dgp6_into_dgp6_refined_2,
+    FE_DGP_2d::dgp6_into_dgp6_refined_3 }
 };
 
 template <>
index cb5a4f892c6edec0ada3c1b4939503b63fb473be..80535d21d0f0a36cbbb84223decf3de83286f735 100644 (file)
@@ -750,45 +750,45 @@ const double * const
 FE_DGP<3>::Matrices::embedding[][GeometryInfo<3>::children_per_cell] =
 {
   { FE_DGP_3d::dgp0_into_dgp0_refined_0,
-      FE_DGP_3d::dgp0_into_dgp0_refined_1,
-      FE_DGP_3d::dgp0_into_dgp0_refined_2,
-      FE_DGP_3d::dgp0_into_dgp0_refined_3,
-      FE_DGP_3d::dgp0_into_dgp0_refined_4,
-      FE_DGP_3d::dgp0_into_dgp0_refined_5,
-      FE_DGP_3d::dgp0_into_dgp0_refined_6,
-      FE_DGP_3d::dgp0_into_dgp0_refined_7},
-    { FE_DGP_3d::dgp1_into_dgp1_refined_0,
-       FE_DGP_3d::dgp1_into_dgp1_refined_1,
-       FE_DGP_3d::dgp1_into_dgp1_refined_2,
-       FE_DGP_3d::dgp1_into_dgp1_refined_3,
-       FE_DGP_3d::dgp1_into_dgp1_refined_4,
-       FE_DGP_3d::dgp1_into_dgp1_refined_5,
-       FE_DGP_3d::dgp1_into_dgp1_refined_6,
-       FE_DGP_3d::dgp1_into_dgp1_refined_7},
-      { FE_DGP_3d::dgp2_into_dgp2_refined_0,
-         FE_DGP_3d::dgp2_into_dgp2_refined_1,
-         FE_DGP_3d::dgp2_into_dgp2_refined_2,
-         FE_DGP_3d::dgp2_into_dgp2_refined_3,
-         FE_DGP_3d::dgp2_into_dgp2_refined_4,
-         FE_DGP_3d::dgp2_into_dgp2_refined_5,
-         FE_DGP_3d::dgp2_into_dgp2_refined_6,
-         FE_DGP_3d::dgp2_into_dgp2_refined_7},
-       { FE_DGP_3d::dgp3_into_dgp3_refined_0,
-           FE_DGP_3d::dgp3_into_dgp3_refined_1,
-           FE_DGP_3d::dgp3_into_dgp3_refined_2,
-           FE_DGP_3d::dgp3_into_dgp3_refined_3,
-           FE_DGP_3d::dgp3_into_dgp3_refined_4,
-           FE_DGP_3d::dgp3_into_dgp3_refined_5,
-           FE_DGP_3d::dgp3_into_dgp3_refined_6,
-           FE_DGP_3d::dgp3_into_dgp3_refined_7},
-         { FE_DGP_3d::dgp4_into_dgp4_refined_0,
-             FE_DGP_3d::dgp4_into_dgp4_refined_1,
-             FE_DGP_3d::dgp4_into_dgp4_refined_2,
-             FE_DGP_3d::dgp4_into_dgp4_refined_3,
-             FE_DGP_3d::dgp4_into_dgp4_refined_4,
-             FE_DGP_3d::dgp4_into_dgp4_refined_5,
-             FE_DGP_3d::dgp4_into_dgp4_refined_6,
-             FE_DGP_3d::dgp4_into_dgp4_refined_7}
+    FE_DGP_3d::dgp0_into_dgp0_refined_1,
+    FE_DGP_3d::dgp0_into_dgp0_refined_2,
+    FE_DGP_3d::dgp0_into_dgp0_refined_3,
+    FE_DGP_3d::dgp0_into_dgp0_refined_4,
+    FE_DGP_3d::dgp0_into_dgp0_refined_5,
+    FE_DGP_3d::dgp0_into_dgp0_refined_6,
+    FE_DGP_3d::dgp0_into_dgp0_refined_7},
+  { FE_DGP_3d::dgp1_into_dgp1_refined_0,
+    FE_DGP_3d::dgp1_into_dgp1_refined_1,
+    FE_DGP_3d::dgp1_into_dgp1_refined_2,
+    FE_DGP_3d::dgp1_into_dgp1_refined_3,
+    FE_DGP_3d::dgp1_into_dgp1_refined_4,
+    FE_DGP_3d::dgp1_into_dgp1_refined_5,
+    FE_DGP_3d::dgp1_into_dgp1_refined_6,
+    FE_DGP_3d::dgp1_into_dgp1_refined_7},
+  { FE_DGP_3d::dgp2_into_dgp2_refined_0,
+    FE_DGP_3d::dgp2_into_dgp2_refined_1,
+    FE_DGP_3d::dgp2_into_dgp2_refined_2,
+    FE_DGP_3d::dgp2_into_dgp2_refined_3,
+    FE_DGP_3d::dgp2_into_dgp2_refined_4,
+    FE_DGP_3d::dgp2_into_dgp2_refined_5,
+    FE_DGP_3d::dgp2_into_dgp2_refined_6,
+    FE_DGP_3d::dgp2_into_dgp2_refined_7},
+  { FE_DGP_3d::dgp3_into_dgp3_refined_0,
+    FE_DGP_3d::dgp3_into_dgp3_refined_1,
+    FE_DGP_3d::dgp3_into_dgp3_refined_2,
+    FE_DGP_3d::dgp3_into_dgp3_refined_3,
+    FE_DGP_3d::dgp3_into_dgp3_refined_4,
+    FE_DGP_3d::dgp3_into_dgp3_refined_5,
+    FE_DGP_3d::dgp3_into_dgp3_refined_6,
+    FE_DGP_3d::dgp3_into_dgp3_refined_7},
+  { FE_DGP_3d::dgp4_into_dgp4_refined_0,
+    FE_DGP_3d::dgp4_into_dgp4_refined_1,
+    FE_DGP_3d::dgp4_into_dgp4_refined_2,
+    FE_DGP_3d::dgp4_into_dgp4_refined_3,
+    FE_DGP_3d::dgp4_into_dgp4_refined_4,
+    FE_DGP_3d::dgp4_into_dgp4_refined_5,
+    FE_DGP_3d::dgp4_into_dgp4_refined_6,
+    FE_DGP_3d::dgp4_into_dgp4_refined_7}
 };
 
 
index 3bbfb5b61a1672669882bff75f9074f9a76f2b39..6c876ce3ec573e1e065d542be663b9c4c7386448 100644 (file)
@@ -50,7 +50,7 @@ void FETools::get_interpolation_matrix(const FiniteElement<dim> &fe1,
                                   // Initialize FEValues for fe1 at
                                   // the unit support points of the
                                   // fe2 element.
-  const typename std::vector<Point<dim> > &
+  const std::vector<Point<dim> > &
     fe2_support_points = fe2.get_unit_support_points ();
 
   Assert(fe2_support_points.size()==fe2.dofs_per_cell,
index a22829b9ecd588baac437eeb3a42dac5dce5882e..41cefe5931c35525ae1cd1558e43c14304e2609c 100644 (file)
@@ -145,7 +145,7 @@ FEValuesBase<dim>::~FEValuesBase ()
 template <int dim>
 template <class InputVector, typename number>
 void FEValuesBase<dim>::get_function_values (const InputVector            &fe_function,
-                                            typename std::vector<number> &values) const
+                                            std::vector<number> &values) const
 {
   Assert (this->update_flags & update_values, ExcAccessToUninitializedField());
   Assert (fe->n_components() == 1,
@@ -183,7 +183,7 @@ void FEValuesBase<dim>::get_function_values (const InputVector            &fe_fu
 template <int dim>
 template <class InputVector, typename number>
 void FEValuesBase<dim>::get_function_values (const InputVector                     &fe_function,
-                                            typename std::vector<Vector<number> > &values) const
+                                            std::vector<Vector<number> > &values) const
 {
   Assert (n_quadrature_points == values.size(),
          ExcWrongVectorSize(values.size(), n_quadrature_points));
@@ -228,7 +228,7 @@ void FEValuesBase<dim>::get_function_values (const InputVector
 
 
 template <int dim>
-const typename std::vector<Point<dim> > &
+const std::vector<Point<dim> > &
 FEValuesBase<dim>::get_quadrature_points () const
 {
   Assert (this->update_flags & update_q_points, ExcAccessToUninitializedField());
@@ -252,7 +252,7 @@ template <class InputVector>
 void
 FEValuesBase<dim>::
 get_function_grads (const InputVector                    &fe_function,
-                   typename std::vector<Tensor<1,dim> > &gradients) const
+                   std::vector<Tensor<1,dim> > &gradients) const
 {
   Assert (this->update_flags & update_gradients, ExcAccessToUninitializedField());
 
@@ -296,7 +296,7 @@ template <class InputVector>
 void
 FEValuesBase<dim>::
 get_function_grads (const InputVector                                           &fe_function,
-                   typename std::vector<typename std::vector<Tensor<1,dim> > > &gradients) const
+                   std::vector<std::vector<Tensor<1,dim> > > &gradients) const
 {
   Assert (n_quadrature_points == gradients.size(),
          ExcWrongNoOfComponents());
@@ -352,7 +352,7 @@ template <class InputVector>
 void
 FEValuesBase<dim>::
 get_function_2nd_derivatives (const InputVector                    &fe_function,
-                             typename std::vector<Tensor<2,dim> > &second_derivatives) const
+                             std::vector<Tensor<2,dim> > &second_derivatives) const
 {
   Assert (fe->n_components() == 1,
          ExcWrongNoOfComponents());
@@ -395,7 +395,7 @@ template <class InputVector>
 void
 FEValuesBase<dim>::
 get_function_2nd_derivatives (const InputVector                                           &fe_function,
-                             typename std::vector<typename std::vector<Tensor<2,dim> > > &second_derivs) const
+                             std::vector<std::vector<Tensor<2,dim> > > &second_derivs) const
 {
   Assert (n_quadrature_points == second_derivs.size(),
          ExcWrongNoOfComponents());
@@ -647,7 +647,7 @@ FEFaceValuesBase<dim>::FEFaceValuesBase (const unsigned int n_q_points,
 
 
 template <int dim>
-const typename std::vector<Point<dim> > &
+const std::vector<Point<dim> > &
 FEFaceValuesBase<dim>::get_normal_vectors () const
 {
   Assert (this->update_flags & update_normal_vectors,
@@ -658,7 +658,7 @@ FEFaceValuesBase<dim>::get_normal_vectors () const
 
 
 template <int dim>
-const typename std::vector<Tensor<1,dim> > &
+const std::vector<Tensor<1,dim> > &
 FEFaceValuesBase<dim>::get_boundary_forms () const
 {
   Assert (this->update_flags & update_boundary_forms,
index 14139d60a55d73a325e7c1972214ca58020c1f0c..559ba4ec359d6e80c6b5f59a9225714ebe2a2542 100644 (file)
@@ -192,7 +192,7 @@ MappingC1<2>::add_line_support_points (const Triangulation<2>::cell_iterator &ce
 template <int dim>
 void
 MappingC1<dim>::add_line_support_points (const typename Triangulation<dim>::cell_iterator &,
-                                        typename std::vector<Point<dim> > &) const
+                                        std::vector<Point<dim> > &) const
 {
   Assert (false, ExcNotImplemented());
 };
@@ -234,7 +234,7 @@ MappingC1<2>::add_quad_support_points (const Triangulation<2>::cell_iterator &,
 template <int dim>
 void
 MappingC1<dim>::add_quad_support_points (const typename Triangulation<dim>::cell_iterator &,
-                                        typename std::vector<Point<dim> > &) const
+                                        std::vector<Point<dim> > &) const
 {
   Assert (false, ExcNotImplemented());
 };
index b1c4e8facf55dd9e42aa1c02f5818dd573b1eac7..c1dac9784ea95330b84d197706f0bb023f87fd11 100644 (file)
@@ -135,8 +135,8 @@ MappingCartesian<dim>::compute_fill (const typename DoFHandler<dim>::cell_iterat
                                     const unsigned int        face_no,
                                     const unsigned int        sub_no,
                                     InternalData             &data,
-                                    typename std::vector<Point<dim> > &quadrature_points,
-                                    typename std::vector<Point<dim> > &normal_vectors) const
+                                    std::vector<Point<dim> > &quadrature_points,
+                                    std::vector<Point<dim> > &normal_vectors) const
 {
   UpdateFlags update_flags(data.current_update_flags());
 
@@ -278,7 +278,7 @@ void
 MappingCartesian<dim>::fill_fe_values (const typename DoFHandler<dim>::cell_iterator& cell,
                                       const Quadrature<dim>& q, 
                                       typename Mapping<dim>::InternalDataBase& mapping_data,
-                                      typename std::vector<Point<dim> >& quadrature_points,
+                                      std::vector<Point<dim> >& quadrature_points,
                                       std::vector<double>& JxW_values) const
 {
                                   // convert data object to internal
@@ -287,7 +287,7 @@ MappingCartesian<dim>::fill_fe_values (const typename DoFHandler<dim>::cell_iter
                                   // possible
   InternalData &data = dynamic_cast<InternalData&> (mapping_data);
 
-  typename std::vector<Point<dim> > dummy;
+  std::vector<Point<dim> > dummy;
   
   compute_fill (cell, invalid_face_number, invalid_face_number,
                data,
@@ -317,10 +317,10 @@ MappingCartesian<dim>::fill_fe_face_values (const typename DoFHandler<dim>::cell
                                            const unsigned int            face_no,
                                            const Quadrature<dim-1>      &q,
                                            typename Mapping<dim>::InternalDataBase &mapping_data,
-                                           typename std::vector<Point<dim> >     &quadrature_points,
+                                           std::vector<Point<dim> >     &quadrature_points,
                                            std::vector<double>          &JxW_values,
-                                           typename std::vector<Tensor<1,dim> >  &boundary_forms,
-                                           typename std::vector<Point<dim> >     &normal_vectors) const
+                                           std::vector<Tensor<1,dim> >  &boundary_forms,
+                                           std::vector<Point<dim> >     &normal_vectors) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -363,10 +363,10 @@ MappingCartesian<dim>::fill_fe_subface_values (const typename DoFHandler<dim>::c
                                               const unsigned int       sub_no,
                                               const Quadrature<dim-1> &q,
                                               typename Mapping<dim>::InternalDataBase &mapping_data,
-                                              typename std::vector<Point<dim> >     &quadrature_points,
+                                              std::vector<Point<dim> >     &quadrature_points,
                                               std::vector<double>          &JxW_values,
-                                              typename std::vector<Tensor<1,dim> >  &boundary_forms,
-                                              typename std::vector<Point<dim> >     &normal_vectors) const
+                                              std::vector<Tensor<1,dim> >  &boundary_forms,
+                                              std::vector<Point<dim> >     &normal_vectors) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
index 3f5baa1d127f7616e7568b5ba5ef7b780a9f7910..3ac7c029029916125b70a2ace1d197da06ee1a6e 100644 (file)
@@ -166,7 +166,7 @@ MappingQ<1>::compute_shapes_virtual (const std::vector<Point<1> > &unit_points,
 
 template<int dim>
 void
-MappingQ<dim>::compute_shapes_virtual (const typename std::vector<Point<dim> > &unit_points,
+MappingQ<dim>::compute_shapes_virtual (const std::vector<Point<dim> > &unit_points,
                                       typename MappingQ1<dim>::InternalData &data) const
 {
   const unsigned int n_points=unit_points.size();
@@ -263,7 +263,7 @@ void
 MappingQ<dim>::fill_fe_values (const typename DoFHandler<dim>::cell_iterator &cell,
                               const Quadrature<dim>                &q,
                               typename Mapping<dim>::InternalDataBase       &mapping_data,
-                              typename std::vector<Point<dim> >             &quadrature_points,
+                              std::vector<Point<dim> >             &quadrature_points,
                               std::vector<double>                  &JxW_values) const
 {
                                   // convert data object to internal
@@ -301,10 +301,10 @@ MappingQ<dim>::fill_fe_face_values (const typename DoFHandler<dim>::cell_iterato
                                    const unsigned int       face_no,
                                    const Quadrature<dim-1> &q,
                                    typename Mapping<dim>::InternalDataBase &mapping_data,
-                                   typename std::vector<Point<dim> >     &quadrature_points,
+                                   std::vector<Point<dim> >     &quadrature_points,
                                    std::vector<double>          &JxW_values,
-                                   typename std::vector<Tensor<1,dim> >  &exterior_forms,
-                                   typename std::vector<Point<dim> >     &normal_vectors) const
+                                   std::vector<Tensor<1,dim> >  &exterior_forms,
+                                   std::vector<Point<dim> >     &normal_vectors) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -356,10 +356,10 @@ MappingQ<dim>::fill_fe_subface_values (const typename DoFHandler<dim>::cell_iter
                                       const unsigned int       sub_no,
                                       const Quadrature<dim-1> &q,
                                       typename Mapping<dim>::InternalDataBase &mapping_data,
-                                      typename std::vector<Point<dim> >     &quadrature_points,
+                                      std::vector<Point<dim> >     &quadrature_points,
                                       std::vector<double>          &JxW_values,
-                                      typename std::vector<Tensor<1,dim> >  &exterior_forms,
-                                      typename std::vector<Point<dim> >     &normal_vectors) const
+                                      std::vector<Tensor<1,dim> >  &exterior_forms,
+                                      std::vector<Point<dim> >     &normal_vectors) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -631,7 +631,7 @@ MappingQ<dim>::compute_laplace_vector(std::vector<std::vector<double> > &lvs) co
 template <int dim>
 void
 MappingQ<dim>::apply_laplace_vector(const std::vector<std::vector<double> > &lvs,
-                                   typename std::vector<Point<dim> > &a) const
+                                   std::vector<Point<dim> > &a) const
 {
   Assert(lvs.size()!=0, ExcLaplaceVectorNotSet(degree));
   const unsigned int n_inner_apply=lvs.size();
@@ -662,7 +662,7 @@ template <int dim>
 void
 MappingQ<dim>::compute_mapping_support_points(
   const typename Triangulation<dim>::cell_iterator &cell,
-  typename std::vector<Point<dim> > &a) const
+  std::vector<Point<dim> > &a) const
 {
                                   // if this is a cell for which we
                                   // want to compute the full
@@ -694,7 +694,7 @@ MappingQ<dim>::compute_mapping_support_points(
 template <int dim>
 void
 MappingQ<dim>::compute_support_points_laplace(const typename Triangulation<dim>::cell_iterator &cell,
-                                             typename std::vector<Point<dim> > &a) const
+                                             std::vector<Point<dim> > &a) const
 {
                                   // in any case, we need the
                                   // vertices first
@@ -736,7 +736,7 @@ MappingQ<dim>::compute_support_points_laplace(const typename Triangulation<dim>:
 template <int dim>
 void
 MappingQ<dim>::compute_support_points_simple(const typename Triangulation<dim>::cell_iterator &cell,
-                                            typename std::vector<Point<dim> > &a) const
+                                            std::vector<Point<dim> > &a) const
 {
   Assert(a.size()==0, ExcInternalError());
                                   // the vertices first
@@ -833,7 +833,7 @@ MappingQ<1>::add_line_support_points (const Triangulation<1>::cell_iterator &,
 template <int dim>
 void
 MappingQ<dim>::add_line_support_points (const typename Triangulation<dim>::cell_iterator &cell,
-                                       typename std::vector<Point<dim> > &a) const
+                                       std::vector<Point<dim> > &a) const
 {
   static const StraightBoundary<dim> straight_boundary;
                                   // if we only need the midpoint,
@@ -1023,7 +1023,7 @@ MappingQ<3>::add_quad_support_points(const Triangulation<3>::cell_iterator &cell
 template<int dim>
 void
 MappingQ<dim>::add_quad_support_points(const typename Triangulation<dim>::cell_iterator &,
-                                      typename std::vector<Point<dim> > &) const
+                                      std::vector<Point<dim> > &) const
 {
   Assert (dim > 2, ExcImpossibleInDim(dim));
 }
@@ -1062,7 +1062,7 @@ MappingQ<3>::fill_quad_support_points_simple (const Triangulation<3>::cell_itera
 template <int dim>
 void
 MappingQ<dim>::fill_quad_support_points_simple (const typename Triangulation<dim>::cell_iterator &,
-                                               typename std::vector<Point<dim> > &) const
+                                               std::vector<Point<dim> > &) const
 {}
 
 
index 0046e34a340950af43424b966af796bb34d1815a..e4bb98b2ebcc78afa3d0d7cfb2cf181eea77bc74 100644 (file)
@@ -35,7 +35,7 @@ template <int dim>
 void
 MappingQ1Eulerian<dim>::compute_mapping_support_points(
   const typename Triangulation<dim>::cell_iterator &cell,
-  typename std::vector<Point<dim> > &a) const
+  std::vector<Point<dim> > &a) const
 {
 
                                   // The assertions can not be in the
index 8b6334ecd75b9213ceab3a474e3f696450d06119..497d6f9e9b0cd38e398df82b106351accf0f97f0 100644 (file)
@@ -848,7 +848,7 @@ void GridGenerator::laplace_transformation (Triangulation<1> &,
 
 template <int dim>
 void GridGenerator::laplace_transformation (Triangulation<dim> &tria,
-                                           const typename std::map<unsigned int,Point<dim> > &new_points)
+                                           const std::map<unsigned int,Point<dim> > &new_points)
 {
                                   // first provide everything that is
                                   // needed for solving a Laplace
index cea4f49d8f767ef0f7f473683305ac8bdf2813b5..eec1d5ff3e3651455a5ad052eaf21cbd95f766ef 100644 (file)
@@ -419,8 +419,8 @@ void GridIn<dim>::skip_comment_lines (std::istream &in,
 
 template <int dim>
 void
-GridIn<dim>::delete_unused_vertices (typename std::vector<Point<dim> >    &vertices,
-                                    typename std::vector<CellData<dim> > &cells,
+GridIn<dim>::delete_unused_vertices (std::vector<Point<dim> >    &vertices,
+                                    std::vector<CellData<dim> > &cells,
                                     SubCellData                          &subcelldata)
 {
                                   // first check which vertices are
@@ -474,9 +474,9 @@ GridIn<dim>::delete_unused_vertices (typename std::vector<Point<dim> >    &verti
 
 
 template <int dim>
-void GridIn<dim>::debug_output_grid (const typename std::vector<CellData<dim> > &/*cells*/,
-                                    const typename std::vector<Point<dim> >    &/*vertices*/,
-                                    std::ostream                               &/*out*/)
+void GridIn<dim>::debug_output_grid (const std::vector<CellData<dim> > &/*cells*/,
+                                    const std::vector<Point<dim> >    &/*vertices*/,
+                                    std::ostream                      &/*out*/)
 {
   Assert (false, ExcNotImplemented());
 };
index 27c3bb1ed5ba5397bd9c8ba283594571c5925542..7f3468a47fa32bac00524ff03ccf84b41eeb12cf 100644 (file)
@@ -493,7 +493,7 @@ void GridOut::write_gnuplot (const Triangulation<dim> &tria,
   Quadrature<dim> *q_projector=0;
   if (mapping!=0)
     {
-      typename std::vector<Point<dim-1> > boundary_points(n_points);
+      std::vector<Point<dim-1> > boundary_points(n_points);
       for (unsigned int i=0; i<n_points; ++i)
        boundary_points[i](0)= 1.*(i+1)/(n_points+1);
 
@@ -807,7 +807,7 @@ void GridOut::write_eps (const Triangulation<dim> &tria,
                                             // points on a face and
                                             // project them onto the
                                             // faces of a unit cell
-           typename std::vector<Point<dim-1> > boundary_points (n_points);
+           std::vector<Point<dim-1> > boundary_points (n_points);
            
            for (unsigned int i=0; i<n_points; ++i)
              boundary_points[i](0) = 1.*(i+1)/(n_points+1);
index 00bdb309eb3ebd68585dfa153cfe2ca27ff86cba..125ad70f67140b3bfbc1729df9a65f88b20d2594 100644 (file)
@@ -95,7 +95,7 @@ unsigned int GridReordering<dim>::Cell::count_neighbors () const
 
 template <int dim>
 void
-GridReordering<dim>::Cell::insert_faces (typename std::map<Face,FaceData> &/*global_faces*/)
+GridReordering<dim>::Cell::insert_faces (std::map<Face,FaceData> &/*global_faces*/)
 {
   Assert (false, ExcNotImplemented());
 };
@@ -730,9 +730,9 @@ GridReordering<dim>::FaceData::FaceData () :
 
 template <int dim>
 inline
-void GridReordering<dim>::track_back (typename std::vector<Cell> &cells,
-                                     RotationStack              &rotation_states,
-                                     const unsigned              tbtc)
+void GridReordering<dim>::track_back (std::vector<Cell> &cells,
+                                     RotationStack     &rotation_states,
+                                     const unsigned     tbtc)
 {
   unsigned int track_back_to_cell = tbtc;
   
@@ -806,8 +806,8 @@ void GridReordering<dim>::track_back (typename std::vector<Cell> &cells,
 
 
 template <int dim>
-bool GridReordering<dim>::try_rotate_single_neighbors (typename std::vector<Cell> &cells,
-                                                      RotationStack              &rotation_states)
+bool GridReordering<dim>::try_rotate_single_neighbors (std::vector<Cell> &cells,
+                                                      RotationStack     &rotation_states)
 {
                                   // the rotation state of the cell
                                   // which we try to add by rotating
@@ -922,8 +922,8 @@ bool GridReordering<dim>::try_rotate_single_neighbors (typename std::vector<Cell
 
 
 template <int dim>
-void GridReordering<dim>::find_reordering (typename std::vector<Cell>           &cells,
-                                          typename std::vector<CellData<dim> > &original_cells,
+void GridReordering<dim>::find_reordering (std::vector<Cell>           &cells,
+                                          std::vector<CellData<dim> > &original_cells,
                                           const std::vector<unsigned int>      &new_cell_numbers)
 {
 //  cout << "Starting..." << flush;
@@ -1110,8 +1110,8 @@ void GridReordering<dim>::find_reordering (typename std::vector<Cell>
 
 template <int dim>
 std::vector<unsigned int>
-GridReordering<dim>::presort_cells (typename std::vector<Cell>       &cells,
-                                   typename std::map<Face,FaceData> &faces)
+GridReordering<dim>::presort_cells (std::vector<Cell>       &cells,
+                                   std::map<Face,FaceData> &faces)
 {
                                   // first find the cell with the
                                   // least neighbors
@@ -1264,7 +1264,7 @@ GridReordering<dim>::presort_cells (typename std::vector<Cell>       &cells,
                      
 
 template <int dim>
-void GridReordering<dim>::reorder_cells (typename std::vector<CellData<dim> > &original_cells)
+void GridReordering<dim>::reorder_cells (std::vector<CellData<dim> > &original_cells)
 {
                                   // we need more information than
                                   // provided by the input parameter,
index ca166e9a04eb3b4cb9ded1e7c1ec499756fa445f..6f58c1f41fa5628c0786f3fa83bde406d1ce3049 100644 (file)
@@ -125,8 +125,8 @@ PersistentTriangulation<dim>::copy_triangulation (const Triangulation<dim> &old_
 
 template <int dim>
 void
-PersistentTriangulation<dim>::create_triangulation (const typename std::vector<Point<dim> >    &,
-                                                   const typename std::vector<CellData<dim> > &,
+PersistentTriangulation<dim>::create_triangulation (const std::vector<Point<dim> >    &,
+                                                   const std::vector<CellData<dim> > &,
                                                    const SubCellData                 &)
 {
   Assert (false, ExcFunctionNotUseful());
index fcb0eed86975e4c530de8b11e309f8d1f0584edd..7a548d8c3f54b7a84b0e7a0dfd5ebc42371f9688 100644 (file)
@@ -4230,7 +4230,7 @@ Triangulation<dim>::n_vertices () const
 
 
 template <int dim>
-const typename std::vector<Point<dim> > &
+const std::vector<Point<dim> > &
 Triangulation<dim>::get_vertices () const 
 {
   return vertices;
index c75b4a1b6a070a8aadc668b94393c97c4e8e0805..f5b666add7aa1e1ac6479059df49bc36e13ef3f6 100644 (file)
@@ -44,7 +44,7 @@ template <int dim>
 void
 Boundary<dim>::
 get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &,
-                                typename std::vector<Point<dim> > &) const
+                                std::vector<Point<dim> > &) const
 {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
@@ -55,7 +55,7 @@ template <int dim>
 void
 Boundary<dim>::
 get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &,
-                                typename std::vector<Point<dim> > &) const
+                                std::vector<Point<dim> > &) const
 {
   Assert (false, ExcPureVirtualFunctionCalled());
 };
@@ -126,7 +126,7 @@ template <int dim>
 void
 StraightBoundary<dim>::
 get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &,
-                                typename std::vector<Point<dim> > &) const
+                                std::vector<Point<dim> > &) const
 {
   Assert(false, typename Boundary<dim>::ExcFunctionNotUseful(dim));
 }
@@ -139,7 +139,7 @@ template <int dim>
 void
 StraightBoundary<dim>::
 get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                typename std::vector<Point<dim> > &points) const
+                                std::vector<Point<dim> > &points) const
 {
   const unsigned int n=points.size();
   Assert(n>0, ExcInternalError());
@@ -164,7 +164,7 @@ template <int dim>
 void
 StraightBoundary<dim>::
 get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &,
-                                typename std::vector<Point<dim> > &) const
+                                std::vector<Point<dim> > &) const
 {
   Assert(false, typename Boundary<dim>::ExcFunctionNotUseful(dim));
 }
@@ -175,7 +175,7 @@ template <int dim>
 void
 StraightBoundary<dim>::
 get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                typename std::vector<Point<dim> > &points) const
+                                std::vector<Point<dim> > &points) const
 {
   const unsigned int n=points.size(),
                     m=static_cast<unsigned int>(std::sqrt(static_cast<double>(n)));
index 6f9ada2841b32323c828d4d4ed3c55de7993f488..ca8b11af904678ff2147c0904f0adb9315126569 100644 (file)
@@ -86,7 +86,7 @@ template <int dim>
 void
 CylinderBoundary<dim>::get_intermediate_points_on_line (
   const typename Triangulation<dim>::line_iterator &line,
-  typename std::vector<Point<dim> > &points) const
+  std::vector<Point<dim> > &points) const
 {
   if (points.size()==1)
     points[0]=get_new_point_on_line(line);
@@ -99,7 +99,7 @@ template <int dim>
 void
 CylinderBoundary<dim>::get_intermediate_points_between_points (
   const Point<dim> &v0, const Point<dim> &v1,
-  typename std::vector<Point<dim> > &points) const
+  std::vector<Point<dim> > &points) const
 {
   const unsigned int n=points.size();
   Assert(n>0, ExcInternalError());
@@ -166,7 +166,7 @@ template <int dim>
 void
 CylinderBoundary<dim>::get_intermediate_points_on_quad (
   const typename Triangulation<dim>::quad_iterator &,
-  typename std::vector<Point<dim> > &) const
+  std::vector<Point<dim> > &) const
 {
   Assert(false, Boundary<dim>::ExcFunctionNotUseful(dim));
 }
@@ -303,7 +303,7 @@ template <int dim>
 void
 HyperBallBoundary<dim>::get_intermediate_points_on_line (
   const typename Triangulation<dim>::line_iterator &line,
-  typename std::vector<Point<dim> > &points) const
+  std::vector<Point<dim> > &points) const
 {
   if (points.size()==1)
     points[0]=get_new_point_on_line(line);
@@ -316,7 +316,7 @@ template <int dim>
 void
 HyperBallBoundary<dim>::get_intermediate_points_between_points (
   const Point<dim> &p0, const Point<dim> &p1,
-  typename std::vector<Point<dim> > &points) const
+  std::vector<Point<dim> > &points) const
 {
   const unsigned int n=points.size();
   Assert(n>0, ExcInternalError());
@@ -428,7 +428,7 @@ template <int dim>
 void
 HyperBallBoundary<dim>::get_intermediate_points_on_quad (
   const typename Triangulation<dim>::quad_iterator &,
-  typename std::vector<Point<dim> > &) const
+  std::vector<Point<dim> > &) const
 {
   Assert(false, Boundary<dim>::ExcFunctionNotUseful(dim));
 }
@@ -541,7 +541,7 @@ template <int dim>
 void
 HalfHyperBallBoundary<dim>::
 get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                typename std::vector<Point<dim> > &points) const
+                                std::vector<Point<dim> > &points) const
 {
                                   // check whether center of object is
                                   // at x==0, since then it belongs
@@ -560,7 +560,7 @@ template <int dim>
 void
 HalfHyperBallBoundary<dim>::
 get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                typename std::vector<Point<dim> > &points) const
+                                std::vector<Point<dim> > &points) const
 {
                                   // check whether center of object is
                                   // at x==0, since then it belongs
@@ -709,7 +709,7 @@ template <int dim>
 void
 HalfHyperShellBoundary<dim>::
 get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterator &line,
-                                typename std::vector<Point<dim> > &points) const
+                                std::vector<Point<dim> > &points) const
 {
                                   // check whether center of object is
                                   // at x==0, since then it belongs
@@ -728,7 +728,7 @@ template <int dim>
 void
 HalfHyperShellBoundary<dim>::
 get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterator &quad,
-                                typename std::vector<Point<dim> > &points) const
+                                std::vector<Point<dim> > &points) const
 {
                                   // check whether center of object is
                                   // at x==0, since then it belongs
index 7ab13320c2b20df301576e253a1d4188ce24eea5..c0c2b55226ec6f5a612157488e31a5661c36b85b 100644 (file)
@@ -1768,7 +1768,7 @@ void MGDoFHandler<dim>::clear_space ()
 
                                   // also delete vector of vertex
                                   // indices
-  typename std::vector<MGVertexDoFs> tmp;
+  std::vector<MGVertexDoFs> tmp;
   std::swap (mg_vertex_dofs, tmp);
 };
 
index 8ae4f470220139029ea23d0127da579547602072..91b3f161b64ec87107b8cac38222eb16f7bd4607 100644 (file)
@@ -309,7 +309,7 @@ DataOut_DoFData<dof_handler_dim,patch_dim,patch_space_dim>::get_dataset_names ()
 
 
 template <int dof_handler_dim, int patch_dim, int patch_space_dim>
-const typename std::vector< ::DataOutBase::Patch<patch_dim, patch_space_dim> > &
+const std::vector< ::DataOutBase::Patch<patch_dim, patch_space_dim> > &
 DataOut_DoFData<dof_handler_dim,patch_dim,patch_space_dim>::get_patches () const
 {
   return patches;
@@ -478,7 +478,7 @@ void DataOut<dim>::build_patches (const unsigned int n_subdivisions,
                                   // clear the patches array
   if (true)
     {
-      typename std::vector< ::DataOutBase::Patch<dim> > dummy;
+      std::vector< ::DataOutBase::Patch<dim> > dummy;
       this->patches.swap (dummy);
     };
   
index e5cf05e65b24b44a798631384c43fcc98d26fed3..84267655606a96fa0e62678f7252493332edc234 100644 (file)
@@ -355,7 +355,7 @@ DataOutStack<dim>::memory_consumption () const
 
 
 template <int dim>
-const typename std::vector< ::DataOutBase::Patch<dim+1> > &
+const std::vector< ::DataOutBase::Patch<dim+1> > &
 DataOutStack<dim>::get_patches () const
 {
   return patches;
index 1e734620461fc5f9a906c93e9c3946da8028c7a2..94b240d4efe525f77d9a9c56ba1f04a1889115d0 100644 (file)
@@ -49,20 +49,20 @@ Histogram::Interval::memory_consumption () const
 
 
 template <typename number>
-void Histogram::evaluate (const typename std::vector<Vector<number> > &values,
-                         const std::vector<double>                   &_y_values,
-                         const unsigned int                           n_intervals,
-                         const IntervalSpacing                        interval_spacing)
+void Histogram::evaluate (const std::vector<Vector<number> > &values,
+                         const std::vector<double>          &y_values_,
+                         const unsigned int                  n_intervals,
+                         const IntervalSpacing               interval_spacing)
 {
   Assert (values.size() > 0, ExcEmptyData());
   Assert (n_intervals > 0, ExcInvalidIntervals());
   for (unsigned int i=0; i<values.size(); ++i)
     Assert (values[i].size() > 0, ExcEmptyData());
-  Assert (values.size() == _y_values.size(),
-         ExcIncompatibleArraySize(values.size(), _y_values.size()));
+  Assert (values.size() == y_values_.size(),
+         ExcIncompatibleArraySize(values.size(), y_values_.size()));
 
                                   // store y_values
-  y_values = _y_values;
+  y_values = y_values_;
   
                                   // first find minimum and maximum value
                                   // in the indicators
index 120a56b6b6e5e5f2b66194eb9eb567ae8be09c14..0b819826b8a367e8574fb534126c3893bf118b6d 100644 (file)
@@ -151,7 +151,7 @@ void SolutionTransfer<dim, number>::refine_interpolate (Vector<number> &vec) con
 template<int dim, typename number>
 void
 SolutionTransfer<dim, number>::
-prepare_for_coarsening_and_refinement(const typename std::vector<Vector<number> > &all_in)
+prepare_for_coarsening_and_refinement(const std::vector<Vector<number> > &all_in)
 {
   Assert(prepared_for!=pure_refinement, ExcAlreadyPrepForRef());
   Assert(!prepared_for!=coarsening_and_refinement, 
@@ -277,8 +277,8 @@ SolutionTransfer<dim, number>::prepare_for_coarsening_and_refinement(const Vecto
 
 template<int dim, typename number>
 void SolutionTransfer<dim, number>::
-interpolate (const typename std::vector<Vector<number> > &all_in,
-            typename std::vector<Vector<number> >       &all_out) const
+interpolate (const std::vector<Vector<number> > &all_in,
+            std::vector<Vector<number> >       &all_out) const
 {
   Assert(prepared_for==coarsening_and_refinement, ExcNotPrepared());
   for (unsigned int i=0; i<all_in.size(); ++i)
index 8c2b2e1de27354c56fd28c7c7764d9723d9ef768..53efe8b20d37ff6459360637a96cf4d393eee4df 100644 (file)
@@ -82,7 +82,7 @@ void VectorTools::interpolate (const Mapping<dim>    &mapping,
                                   // avoided to evaluate
                                   // the vectorfunction multiply at
                                   // the same point on a cell.
-  const typename std::vector<Point<dim> > &
+  const std::vector<Point<dim> > &
     unit_support_points = fe.get_unit_support_points();
   Assert (unit_support_points.size() != 0,
          ExcNonInterpolatingFE());
@@ -815,7 +815,7 @@ VectorTools::interpolate_boundary_values (const Mapping<dim>            &mapping
                                   // support points. this wil be used
                                   // to obtain the quadrature points
                                   // on the real cell's face
-  const typename std::vector<Point<dim-1> >
+  const std::vector<Point<dim-1> >
     & unit_support_points = fe.get_unit_face_support_points();
   
                                   // check whether there are support
index 476f6245af676057492b188351ea4087582c751d..0a1abdc3c92d487c3c2aa699a9197aca3aa53fd9 100644 (file)
@@ -545,7 +545,7 @@ class BlockSparseMatrix : public Subscriptor
                                     /**
                                      * Array of sub-matrices.
                                      */
-    typename std::vector<typename std::vector<SmartPointer<SparseMatrix<number> > > > sub_objects;
+    std::vector<std::vector<SmartPointer<SparseMatrix<number> > > > sub_objects;
 };
 
 
index 25d324f5680a4a11e44643088784f363527a8cea..304e73d5b4671325a242550fe406558a3bf12613 100644 (file)
@@ -358,7 +358,7 @@ class BlockSparsityPatternBase : public Subscriptor
                                     /**
                                      * Array of sparsity patterns.
                                      */
-    typename std::vector<typename std::vector<SmartPointer<SparsityPatternBase> > > sub_objects;
+    std::vector<std::vector<SmartPointer<SparsityPatternBase> > > sub_objects;
 
                                     /**
                                      * Object storing and managing
index 448fb4963e475e995adf1a491229d450e320f1aa..1846876ebff637b5b38ea55879e1e02e2754b287 100644 (file)
@@ -1127,7 +1127,7 @@ class BlockVector
                                     /**
                                      * Pointer to the array of components.
                                      */
-    typename std::vector<Vector<Number> > components;
+    std::vector<Vector<Number> > components;
 
                                     /**
                                      * Object managing the
index 9506957fb8ac5e38d21e3cffeebcac70f91e347c..cda7e2d6764fefb00a445071b2116f99f1851ae8 100644 (file)
@@ -205,7 +205,7 @@ class FilteredMatrix : public Subscriptor
                                      * freedom index and the value it
                                      * shall have.
                                      */
-    typedef typename std::pair<unsigned int,value_type> IndexValuePair;
+    typedef std::pair<unsigned int,value_type> IndexValuePair;
 
                                     /**
                                      * Default constructor. You will
@@ -488,7 +488,7 @@ class FilteredMatrix : public Subscriptor
                                      * the value to which it shall be
                                      * fixed.
                                      */
-    typename std::vector<IndexValuePair> constraints;
+    std::vector<IndexValuePair> constraints;
 
                                     /**
                                      * Vector to be used as temporary
@@ -561,7 +561,7 @@ class FilteredMatrix : public Subscriptor
                                      * matrix types.
                                      */
     void get_column_entries (const unsigned int           index,
-                            typename std::vector<IndexValuePair> &column_entries,
+                            std::vector<IndexValuePair> &column_entries,
                             const bool                   matrix_is_symmetric) const;
 };
 
index 2f6ad1bdd78d667ea84c657c4ba8357311ff4e48..40295cbe93fe87d53b8c042cbb0a1bee8311e474 100644 (file)
@@ -712,7 +712,8 @@ FullMatrix<number>::print (std::ostream       &s,
 template <typename number>
 template <typename number2>
 void
-FullMatrix<number>::add (const number s,const FullMatrix<number2>& src)
+FullMatrix<number>::add (const number               s,
+                        const FullMatrix<number2> &src)
 {
   Assert (this->data() != 0, ExcEmptyMatrix());
   
index 475a6b1a7dbab2d5a9200620d0b83bbceb7d065c..c00ae7f56429492b1f1ebc46ca70663b0a2ab292 100644 (file)
@@ -268,7 +268,7 @@ class PreconditionBlock : public virtual Subscriptor
                                      * memory in comparison with
                                      * @p{inverse_type=double}.
                                      */
-    typename std::vector<FullMatrix<inverse_type> > var_inverse;
+    std::vector<FullMatrix<inverse_type> > var_inverse;
 
                                     /**
                                      * Storage of the original diagonal blocks.
@@ -277,7 +277,7 @@ class PreconditionBlock : public virtual Subscriptor
                                      *
                                      * Used by the blocked SSOR method.
                                      */
-    typename std::vector<FullMatrix<inverse_type> > var_diagonal;
+    std::vector<FullMatrix<inverse_type> > var_diagonal;
                                      
                                     /**
                                      * Flag for diagonal compression.
index f8d5eaf340b4b2c453716da956ca3367e73279c8..a7956b0e9a383cbbe77dbd1bebb52582e3e99bc1 100644 (file)
@@ -754,7 +754,7 @@ class SparseMatrixEZ : public Subscriptor
                                          * entries of a row ordered
                                          * by column number.
                                          */
-       typename std::vector<Entry> values;
+       std::vector<Entry> values;
       };
     
     
index 0ca2d58a46a017f989f1e0a1be855f4ade155ca1..f32db1fa57d8bed9cda753875fa8ed95a08544c0 100644 (file)
@@ -969,7 +969,7 @@ class SparsityPattern : public Subscriptor
                                      */
     template <typename value>
     unsigned int
-    get_column_index_from_iterator (const typename std::pair<unsigned int, value> &i);
+    get_column_index_from_iterator (const std::pair<unsigned int, value> &i);
 
                                     /**
                                      * Likewise, but sometimes needed
@@ -980,7 +980,7 @@ class SparsityPattern : public Subscriptor
                                      */
     template <typename value>
     unsigned int
-    get_column_index_from_iterator (const typename std::pair<const unsigned int, value> &i);
+    get_column_index_from_iterator (const std::pair<const unsigned int, value> &i);
     
                                     /**
                                      * Make all sparse matrices
@@ -1170,7 +1170,8 @@ SparsityPattern::get_column_index_from_iterator (const unsigned int i)
 template <typename value>
 inline
 unsigned int
-SparsityPattern::get_column_index_from_iterator (const typename std::pair<unsigned int, value> &i)
+SparsityPattern::
+get_column_index_from_iterator (const std::pair<unsigned int, value> &i)
 {
   return i.first;
 };
@@ -1180,7 +1181,7 @@ SparsityPattern::get_column_index_from_iterator (const typename std::pair<unsign
 template <typename value>
 inline
 unsigned int
-SparsityPattern::get_column_index_from_iterator (const typename std::pair<const unsigned int, value> &i)
+SparsityPattern::get_column_index_from_iterator (const std::pair<const unsigned int, value> &i)
 {
   return i.first;
 };
index b1c2debc3dacbbbaba695bb9684e100894cb48ee..0e1aacc495bcaa1c505169590642445f6a56a62e 100644 (file)
@@ -155,12 +155,12 @@ class GrowingVectorMemory : public VectorMemory<Vector>
                                      * vector is used, second the
                                      * vector itself.
                                      */
-    typedef typename std::pair<bool, Vector*> entry_type;
+    typedef std::pair<bool, Vector*> entry_type;
 
                                     /**
                                      * Array of allocated vectors.
                                      */
-    typename std::vector<entry_type> pool;
+    std::vector<entry_type> pool;
     
                                     /**
                                      * Overall number of allocations.

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.