From 0e64483df13fef45279c816a5f1d24ced0115a34 Mon Sep 17 00:00:00 2001 From: oliver Date: Wed, 21 Sep 2005 16:12:18 +0000 Subject: [PATCH] Minor fixes, which correct problems with the Mac OSX linker. git-svn-id: https://svn.dealii.org/trunk@11490 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/fe_dgp_monomial.cc | 7 ++++++- deal.II/deal.II/source/numerics/vectors.cc | 8 ++++++++ deal.II/lac/include/lac/lapack_support.h | 10 +++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/deal.II/deal.II/source/fe/fe_dgp_monomial.cc b/deal.II/deal.II/source/fe/fe_dgp_monomial.cc index 36746d0a8e..ee9c22299c 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_monomial.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_monomial.cc @@ -67,6 +67,7 @@ namespace void generate_unit_points (const unsigned int, std::vector > &); +#if deal_II_dimension == 1 template <> void generate_unit_points (const unsigned int k, std::vector > &p) @@ -76,8 +77,9 @@ namespace for (unsigned int i=0; i void generate_unit_points (const unsigned int k, std::vector > &p) @@ -90,7 +92,9 @@ namespace p[i](1)=points2d[start_index2d[k]+i][1]; } } +#endif +#if deal_II_dimension == 3 template <> void generate_unit_points (const unsigned int k, std::vector > &p) @@ -104,6 +108,7 @@ namespace p[i](2)=points3d[start_index3d[k]+i][2]; } } +#endif } diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index 3dbc4d1779..c25045dfc4 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -105,6 +105,14 @@ void VectorTools::project_boundary_values // the following two functions are not derived from a template in 1d // and thus need no explicit instantiation #if deal_II_dimension > 1 +template +void VectorTools::interpolate_boundary_values +(const Mapping &, + const DoFHandler &, + const FunctionMap::type &, + std::map &, + const std::vector &); + template void VectorTools::interpolate_boundary_values (const Mapping &, diff --git a/deal.II/lac/include/lac/lapack_support.h b/deal.II/lac/include/lac/lapack_support.h index 8105cf3e02..6b4455781b 100644 --- a/deal.II/lac/include/lac/lapack_support.h +++ b/deal.II/lac/include/lac/lapack_support.h @@ -59,23 +59,23 @@ namespace LAPACKSupport /** * Character constant. */ - extern const char V = 'V'; + static const char V = 'V'; /** * Character constant. */ - extern const char T = 'T'; + static const char T = 'T'; /** * Character constant. */ - extern const char N = 'N'; + static const char N = 'N'; /** * Integer constant. */ - extern const int zero = 0; + static const int zero = 0; /** * Integer constant. */ - extern const int one = 1; + static const int one = 1; } -- 2.39.5