From 8f7cf890560550aa9287a5b23cf479ef8de441e8 Mon Sep 17 00:00:00 2001
From: kanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 23 Feb 2010 23:04:22 +0000
Subject: [PATCH] move declaration of dimension into FEValuesBase

git-svn-id: https://svn.dealii.org/trunk@20678 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/deal.II/include/fe/fe_values.h | 24 ++++++++++++------------
 deal.II/deal.II/source/fe/fe_values.cc |  8 ++++++--
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h
index 8dd4ee1827..79501b6fe3 100644
--- a/deal.II/deal.II/include/fe/fe_values.h
+++ b/deal.II/deal.II/include/fe/fe_values.h
@@ -1474,6 +1474,18 @@ class FEValuesBase : protected FEValuesData<dim,spacedim>,
                      public Subscriptor
 {
   public:
+                                     /**
+                                      * Dimension in which this object
+                                      * operates.
+                                      */
+    static const unsigned int dimension = dim;
+
+                                     /**
+                                      * Dimension of the space in
+                                      * which this object operates.
+                                      */
+    static const unsigned int space_dimension = spacedim;
+
 				     /**
 				      * Number of quadrature points.
 				      */
@@ -2812,18 +2824,6 @@ template <int dim, int spacedim=dim>
 class FEValues : public FEValuesBase<dim,spacedim>
 {
   public:
-                                     /**
-                                      * Dimension in which this object
-                                      * operates.
-                                      */
-    static const unsigned int dimension = dim;
-
-                                     /**
-                                      * Dimension of the space in
-                                      * which this object operates.
-                                      */
-    static const unsigned int space_dimension = spacedim;
-
                                      /**
                                       * Dimension of the object over
                                       * which we integrate. For the
diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc
index 4134d62af2..983102bcaf 100644
--- a/deal.II/deal.II/source/fe/fe_values.cc
+++ b/deal.II/deal.II/source/fe/fe_values.cc
@@ -3059,17 +3059,21 @@ FEValuesBase<dim,spacedim>::get_cell_similarity () const
 }
 
 
-/*------------------------------- FEValues -------------------------------*/
+template <int dim, int spacedim>
+const unsigned int FEValuesBase<dim,spacedim>::dimension;
 
 
 template <int dim, int spacedim>
-const unsigned int FEValues<dim,spacedim>::dimension;
+const unsigned int FEValuesBase<dim,spacedim>::space_dimension;
+
+/*------------------------------- FEValues -------------------------------*/
 
 template <int dim, int spacedim>
 const unsigned int FEValues<dim,spacedim>::integral_dimension;
 
 
 
+
 template <int dim, int spacedim>
 FEValues<dim,spacedim>::FEValues (const Mapping<dim,spacedim>       &mapping,
 				  const FiniteElement<dim,spacedim> &fe,
-- 
2.39.5