Qualify references to Table from within namespace internal in preparation for a patch...

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

diff --git a/deal.II/include/deal.II/hp/fe_values.h b/deal.II/include/deal.II/hp/fe_values.h
index cad63fdf4fed443acd1377e6969acde133a4c90d..c4d14caa6d370158e96881d41f6f3fdeb58e4b5e 100644 (file)
--- a/deal.II/include/deal.II/hp/fe_values.h
+++ b/deal.II/include/deal.II/hp/fe_values.h
@@ -158,7 +158,7 @@ namespace internal
        * Initially, all entries have zero pointers, and we will allocate them
        * lazily as needed in select_fe_values().
        */
-      Table<3,std_cxx1x::shared_ptr<FEValues> > fe_values_table;
+      dealii::Table<3,std_cxx1x::shared_ptr<FEValues> > fe_values_table;
 
       /**
        * Set of indices pointing at the fe_values object selected last time

diff --git a/deal.II/source/fe/fe_values.cc b/deal.II/source/fe/fe_values.cc
index 639d937fd924a9f7e8522b7266b5e3cabe606321..066c79c4c870fa4b8439a46357df6d2d1e2baf98 100644 (file)
--- a/deal.II/source/fe/fe_values.cc
+++ b/deal.II/source/fe/fe_values.cc
@@ -1000,7 +1000,7 @@ namespace FEValuesViews
     template <int dim, int spacedim>
     void
     do_function_values (const ::dealii::Vector<double> &dof_values,
-                        const Table<2,double>          &shape_values,
+                        const dealii::Table<2,double>          &shape_values,
                         const std::vector<typename SymmetricTensor<2,dim,spacedim>::ShapeFunctionData> &shape_function_data,
                         std::vector<dealii::SymmetricTensor<2,spacedim> > &values)
     {
@@ -1142,7 +1142,7 @@ namespace FEValuesViews
     template <int dim, int spacedim>
     void
     do_function_values (const ::dealii::Vector<double> &dof_values,
-                        const Table<2,double>          &shape_values,
+                        const dealii::Table<2,double>          &shape_values,
                         const std::vector<typename Tensor<2,dim,spacedim>::ShapeFunctionData> &shape_function_data,
                         std::vector<dealii::Tensor<2,spacedim> > &values)
     {
@@ -2201,7 +2201,7 @@ namespace internal
   template <typename Number>
   void
   do_function_values (const double          *dof_values_ptr,
-                      const Table<2,double> &shape_values,
+                      const dealii::Table<2,double> &shape_values,
                       std::vector<Number>   &values)
   {
     // scalar finite elements, so shape_values.size() == dofs_per_cell
@@ -2235,7 +2235,7 @@ namespace internal
   template <int dim, int spacedim, typename VectorType>
   void
   do_function_values (const double                      *dof_values_ptr,
-                      const Table<2,double>             &shape_values,
+                      const dealii::Table<2,double>             &shape_values,
                       const FiniteElement<dim,spacedim> &fe,
                       const std::vector<unsigned int> &shape_function_to_row_table,
                       VectorSlice<std::vector<VectorType> > &values,

diff --git a/deal.II/source/numerics/solution_transfer.cc b/deal.II/source/numerics/solution_transfer.cc
index 5e0ac217ed4ce4d1823d103733c4bd8b453214e4..8a3d59e895a2313396f09c71b5018a5fecaf6591 100644 (file)
--- a/deal.II/source/numerics/solution_transfer.cc
+++ b/deal.II/source/numerics/solution_transfer.cc
@@ -173,12 +173,12 @@ namespace internal
    */
   template <typename DH>
   void extract_interpolation_matrices (const DH &,
-                                       Table<2,FullMatrix<double> > &)
+                                       dealii::Table<2,FullMatrix<double> > &)
   {}
 
   template <int dim, int spacedim>
   void extract_interpolation_matrices (const dealii::hp::DoFHandler<dim,spacedim> &dof,
-                                       Table<2,FullMatrix<double> > &matrices)
+                                       dealii::Table<2,FullMatrix<double> > &matrices)
   {
     const dealii::hp::FECollection<dim,spacedim> &fe = dof.get_fe();
     matrices.reinit (fe.size(), fe.size());