From 329a4fd81a71281c42a2adf397d5fc0f6474594d Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 21 Dec 2013 04:57:01 +0000 Subject: [PATCH] Qualify references to Table from within namespace internal in preparation for a patch to come next. git-svn-id: https://svn.dealii.org/trunk@32076 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/hp/fe_values.h | 2 +- deal.II/source/fe/fe_values.cc | 8 ++++---- deal.II/source/numerics/solution_transfer.cc | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deal.II/include/deal.II/hp/fe_values.h b/deal.II/include/deal.II/hp/fe_values.h index cad63fdf4f..c4d14caa6d 100644 --- 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 > fe_values_table; + dealii::Table<3,std_cxx1x::shared_ptr > 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 639d937fd9..066c79c4c8 100644 --- a/deal.II/source/fe/fe_values.cc +++ b/deal.II/source/fe/fe_values.cc @@ -1000,7 +1000,7 @@ namespace FEValuesViews template void do_function_values (const ::dealii::Vector &dof_values, - const Table<2,double> &shape_values, + const dealii::Table<2,double> &shape_values, const std::vector::ShapeFunctionData> &shape_function_data, std::vector > &values) { @@ -1142,7 +1142,7 @@ namespace FEValuesViews template void do_function_values (const ::dealii::Vector &dof_values, - const Table<2,double> &shape_values, + const dealii::Table<2,double> &shape_values, const std::vector::ShapeFunctionData> &shape_function_data, std::vector > &values) { @@ -2201,7 +2201,7 @@ namespace internal template void do_function_values (const double *dof_values_ptr, - const Table<2,double> &shape_values, + const dealii::Table<2,double> &shape_values, std::vector &values) { // scalar finite elements, so shape_values.size() == dofs_per_cell @@ -2235,7 +2235,7 @@ namespace internal template void do_function_values (const double *dof_values_ptr, - const Table<2,double> &shape_values, + const dealii::Table<2,double> &shape_values, const FiniteElement &fe, const std::vector &shape_function_to_row_table, VectorSlice > &values, diff --git a/deal.II/source/numerics/solution_transfer.cc b/deal.II/source/numerics/solution_transfer.cc index 5e0ac217ed..8a3d59e895 100644 --- a/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/source/numerics/solution_transfer.cc @@ -173,12 +173,12 @@ namespace internal */ template void extract_interpolation_matrices (const DH &, - Table<2,FullMatrix > &) + dealii::Table<2,FullMatrix > &) {} template void extract_interpolation_matrices (const dealii::hp::DoFHandler &dof, - Table<2,FullMatrix > &matrices) + dealii::Table<2,FullMatrix > &matrices) { const dealii::hp::FECollection &fe = dof.get_fe(); matrices.reinit (fe.size(), fe.size()); -- 2.39.5