From 5759fdf55ed9ac79f3123c83bc6237f27d28f10a Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Tue, 26 Jul 2005 14:14:53 +0000
Subject: [PATCH] rearranged the #ifdef blocks such that doxygen doen't get
confused anymore
[[Imported from SVN: r2464]]
---
common/fvector.hh | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/common/fvector.hh b/common/fvector.hh
index 973c41f26..3270589de 100644
--- a/common/fvector.hh
+++ b/common/fvector.hh
@@ -553,6 +553,7 @@ namespace Dune {
};
#endif
+#ifdef DUNE_EXPRESSIONTEMPLATES
/** \brief Construct a vector space out of a tensor product of fields.
K is the field type (use float, double, complex, etc) and n
@@ -563,10 +564,22 @@ namespace Dune {
Implementation of all members uses template meta programs where appropriate
*/
+#else
template<class K, int SIZE>
class FieldVector
-#ifdef DUNE_EXPRESSIONTEMPLATES
: public Dune::ExprTmpl::Vector< FieldVector<K,SIZE> >
+ /** \brief Construct a vector space out of a tensor product of fields.
+
+ K is the field type (use float, double, complex, etc) and n
+ is the number of components.
+
+ It is generally assumed that K is a numerical type compatible with double
+ (E.g. norms are always computed in double precision).
+
+ Implementation of all members uses template meta programs where appropriate
+ */
+ template<class K, int SIZE>
+ class FieldVector
#endif
{
//! The actual number of elements that gets allocated.
@@ -902,12 +915,17 @@ namespace Dune {
// forward declarations
template<class K, int n, int m> class FieldMatrix;
+#ifdef DUNE_EXPRESSIONTEMPLATES
/**! Vectors containing only one component
*/
template<class K>
class FieldVector<K,1>
-#ifdef DUNE_EXPRESSIONTEMPLATES
: public Dune::ExprTmpl::Vector< FieldVector<K,1> >
+#else
+ /**! Vectors containing only one component
+ */
+ template<class K>
+ class FieldVector<K,1>
#endif
{
enum { n = 1 };
--
GitLab