From e5229a15b5ca18799d56dc7b3c8f7d283b579c2c Mon Sep 17 00:00:00 2001 From: wolf Date: Fri, 14 Nov 2003 15:35:57 +0000 Subject: [PATCH] Reintroduce an attempted fix for a static/weak linkage problem. git-svn-id: https://svn.dealii.org/trunk@8185 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/fe_q.cc | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index fc325f592b..c125bf5450 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -59,6 +59,9 @@ namespace // given an integer N, compute its // integer square root (if it // exists, otherwise give up) +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif unsigned int int_sqrt (const unsigned int N) { for (unsigned int i=0; i<=N; ++i) @@ -72,6 +75,9 @@ namespace // given an integer N, compute its // integer cube root (if it // exists, otherwise give up) +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif unsigned int int_cuberoot (const unsigned int N) { for (unsigned int i=0; i<=N; ++i) @@ -85,6 +91,9 @@ namespace // given N, generate i=0...N-1 // equidistant points in the // interior of the interval [0,1] +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif Point<1> generate_unit_point (const unsigned int i, const unsigned int N, @@ -99,6 +108,9 @@ namespace // given N, generate i=0...N-1 // equidistant points in the domain // [0,1]^2 +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif Point<2> generate_unit_point (const unsigned int i, const unsigned int N, @@ -119,6 +131,9 @@ namespace // given N, generate i=0...N-1 // equidistant points in the domain // [0,1]^3 +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif Point<3> generate_unit_point (const unsigned int i, const unsigned int N, @@ -140,6 +155,9 @@ namespace // given N, generate i=0...N-1 // equidistant points in the // interior of the interval [0,1] +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif Point<1> generate_face_unit_point (const unsigned int i, const unsigned int N, @@ -158,6 +176,9 @@ namespace // consider shape functions on // child cells that are located on // existing vertices) +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif Point<2> generate_face_unit_point (const unsigned int i, const unsigned int N, @@ -202,6 +223,9 @@ namespace // specific to the computation of // the constraint matrix, is active // on the given subface +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif bool constraint_function_is_active_on_child (const unsigned int j, const unsigned int subface, @@ -222,6 +246,9 @@ namespace +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif bool constraint_function_is_active_on_child (const unsigned int j, const unsigned int subface, @@ -287,6 +314,9 @@ namespace // constraint numbering, compute // its index in the polynomials // space of a given subface +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif unsigned int constraint_get_local_j (const unsigned int j, const unsigned int subface, @@ -303,6 +333,9 @@ namespace } +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif unsigned int constraint_get_local_j (const unsigned int /*j*/, const unsigned int /*subface*/, @@ -322,6 +355,9 @@ namespace // make things simpler, also pass // the subface on which j is // located +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif bool constraint_is_support_point (const unsigned int i, const unsigned int j, @@ -338,6 +374,9 @@ namespace } +#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) + static +#endif bool constraint_is_support_point (const unsigned int /*i*/, const unsigned int /*j*/, -- 2.39.5