]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix for icc6
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 3 Mar 2004 23:27:09 +0000 (23:27 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 3 Mar 2004 23:27:09 +0000 (23:27 +0000)
git-svn-id: https://svn.dealii.org/trunk@8652 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/dofs/dof_constraints.cc
deal.II/deal.II/source/numerics/error_estimator.cc

index d51dbc3e991d2bada77a9055227862ead35b19d3..a3de04de20d80359c474ff419e466629204b4a46 100644 (file)
@@ -1243,22 +1243,19 @@ ConstraintMatrix::memory_consumption () const
 
 // explicit instantiations
 //
-// define a list of functions for vectors and matrices, respectively,
-// where the vector/matrix can be replaced using a preprocessor
-// variable VectorType/MatrixType. note that we cannot do so by using
-// a preprocessor function with one arg, since
-// #vector_functions(BlockVector<double>)# is not recognized as one
-// arg, and putting parentheses around the arg yields incorrect
-// syntax...
+// define a list of functions for vectors and matrices, respectively, where
+// the vector/matrix can be replaced using a preprocessor variable
+// VectorType/MatrixType. note that we need a space between "VectorType" and
+// ">" to disambiguate ">>" when VectorType trails in an angle bracket
 
 #define VECTOR_FUNCTIONS(VectorType) \
-  template void ConstraintMatrix::condense<VectorType>(const VectorType &uncondensed,\
+  template void ConstraintMatrix::condense<VectorType >(const VectorType &uncondensed,\
                                                       VectorType       &condensed) const;\
-  template void ConstraintMatrix::condense<VectorType>(VectorType &vec) const;\
-  template void ConstraintMatrix::set_zero<VectorType>(VectorType &vec) const;\
-  template void ConstraintMatrix::distribute<VectorType>(const VectorType &condensed,\
+  template void ConstraintMatrix::condense<VectorType >(VectorType &vec) const;\
+  template void ConstraintMatrix::set_zero<VectorType >(VectorType &vec) const;\
+  template void ConstraintMatrix::distribute<VectorType >(const VectorType &condensed,\
                                                         VectorType       &uncondensed) const;\
-  template void ConstraintMatrix::distribute<VectorType>(VectorType &vec) const
+  template void ConstraintMatrix::distribute<VectorType >(VectorType &vec) const
 
 
 VECTOR_FUNCTIONS(Vector<float>);
index bdf6f80c96b00726e630cef6635681e11febc738..150d4383488681ec4bc9f01941683f63b354b0c9 100644 (file)
@@ -1155,12 +1155,16 @@ integrate_over_irregular_face (const DoFHandler<dim>               &dof_handler,
 // explicit instantiations
 template class KellyErrorEstimator<deal_II_dimension>;
 
-// instantiate the externally visible functions
+// instantiate the externally visible functions. define a list of functions
+// for vectors, where the vector/matrix can be replaced using a preprocessor
+// variable VectorType/MatrixType. note that we need a space between
+// "VectorType" and ">" to disambiguate ">>" when VectorType trails in an
+// angle bracket
 #define INSTANTIATE(InputVector) \
 template    \
 void    \
 KellyErrorEstimator<deal_II_dimension>::    \
-estimate<InputVector> (const Mapping<deal_II_dimension>      &,    \
+estimate<InputVector > (const Mapping<deal_II_dimension>      &,    \
           const DoFHandler<deal_II_dimension>   &,    \
           const Quadrature<deal_II_dimension-1> &,    \
           const FunctionMap<deal_II_dimension>::type &,    \
@@ -1173,7 +1177,7 @@ estimate<InputVector> (const Mapping<deal_II_dimension>      &,    \
 template    \
 void    \
 KellyErrorEstimator<deal_II_dimension>::    \
-estimate<InputVector> (const DoFHandler<deal_II_dimension>   &,    \
+estimate<InputVector > (const DoFHandler<deal_II_dimension>   &,    \
           const Quadrature<deal_II_dimension-1> &,    \
           const FunctionMap<deal_II_dimension>::type &,    \
           const InputVector       &,    \
@@ -1185,7 +1189,7 @@ estimate<InputVector> (const DoFHandler<deal_II_dimension>   &,    \
 template    \
 void    \
 KellyErrorEstimator<deal_II_dimension>::    \
-estimate<InputVector> (const Mapping<deal_II_dimension>          &,    \
+estimate<InputVector > (const Mapping<deal_II_dimension>          &,    \
           const DoFHandler<deal_II_dimension>       &,    \
           const Quadrature<deal_II_dimension-1>     &,    \
           const FunctionMap<deal_II_dimension>::type &,    \
@@ -1198,7 +1202,7 @@ estimate<InputVector> (const Mapping<deal_II_dimension>          &,    \
 template    \
 void    \
 KellyErrorEstimator<deal_II_dimension>::    \
-estimate<InputVector> (const DoFHandler<deal_II_dimension>       &,    \
+estimate<InputVector > (const DoFHandler<deal_II_dimension>       &,    \
           const Quadrature<deal_II_dimension-1>     &,    \
           const FunctionMap<deal_II_dimension>::type &,    \
           const std::vector<const InputVector *> &,    \

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.