revert disable-documentation patch

[[Imported from SVN: r5922]]

doc/doxygen/concepts

+/**
+\namespace STL
+\brief <i>preudo namespace</i> for STL concepts
+*/
+
+
+/**
+\interface STL::RandomAccessContainer
+\brief the STL random-access-container interface
+
+see http://www.sgi.com/tech/stl/RandomAccessContainer.html .
+*/

dune/common/fvector.hh

@@ -463,16 +463,16 @@ namespace Dune {
     /** \brief copy constructor */
     FieldVector ( const FieldVector &other )
     {
-      // for( size_type i = 0; i < SIZE; ++i )
-      //   p[ i ] = other[ i ];
-      std::memcpy(p,other.p,SIZE*sizeof(K));
+      for( size_type i = 0; i < SIZE; ++i )
+        p[ i ] = other[ i ];
+      //  std::memcpy(p,other.p,SIZE*sizeof(K));
     }
 
     /** \brief Assigment from other vector */
     FieldVector& operator= (const FieldVector& other) {
-      std::memcpy(p,other.p,SIZE*sizeof(K));
-      // for (size_type i=0; i<SIZE; i++)
-      //     p[i] = other[i];
+      // std::memcpy(p,other.p,SIZE*sizeof(K));
+      for (size_type i=0; i<SIZE; i++)
+        p[i] = other[i];
       return *this;
     }
 

dune/common/geometrytype.hh

@@ -162,44 +162,55 @@ namespace Dune {
       return basicType_ < other.basicType_;
     }
 
-    /** \brief Prints the type to an output stream */
-    friend std::ostream& operator<< (std::ostream& s, const GeometryType& a)
-    {
-      switch (a.basicType_) {
-      case simplex :
-        s << "(simplex, " << a.dim_ << ")";
-        break;
-      case cube :
-        s << "(cube, " << a.dim_ << ")";
-        break;
-      case pyramid :
-        s << "pyramid";
-        break;
-      case prism :
-        s << "prism";
-        break;
-      case none :
-        s << "(none, " << a.dim_ << ")";
-        break;
-      default :
-        s << "invalid geometry type";
-      }
-
-      return s;
-    }
-
+    friend inline std::ostream& operator<< (std::ostream& s, const GeometryType& a);
   };
 
+  /** \brief Prints the type to an output stream */
+  inline std::ostream& operator<< (std::ostream& s, const GeometryType& a)
+  {
+    switch (a.basicType_) {
+    case GeometryType::simplex :
+      s << "(simplex, " << a.dim_ << ")";
+      break;
+    case GeometryType::cube :
+      s << "(cube, " << a.dim_ << ")";
+      break;
+    case GeometryType::pyramid :
+      s << "pyramid";
+      break;
+    case GeometryType::prism :
+      s << "prism";
+      break;
+    case GeometryType::none :
+      s << "(none, " << a.dim_ << ")";
+      break;
+    default :
+      s << "invalid geometry type";
+    }
+    return s;
+  }
+
   /** \brief Prints a GeometryType::BasicType to an output stream */
   inline std::ostream& operator<< (std::ostream& s, GeometryType::BasicType type)
   {
     switch (type) {
-    case GeometryType::simplex : s << "simplex"; break;
-    case GeometryType::cube :    s << "cube";    break;
-    case GeometryType::pyramid : s << "pyramid"; break;
-    case GeometryType::prism :   s << "prism";   break;
-    case GeometryType::none :    s << "none";    break;
-    default : s << "[unknown GeometryType::BasicType: " << int(type) << "]";
+    case GeometryType::simplex :
+      s << "simplex";
+      break;
+    case GeometryType::cube :
+      s << "cube";
+      break;
+    case GeometryType::pyramid :
+      s << "pyramid";
+      break;
+    case GeometryType::prism :
+      s << "prism";
+      break;
+    case GeometryType::none :
+      s << "none";
+      break;
+    default :
+      s << "[unknown GeometryType::BasicType: " << int(type) << "]";
     }
     return s;
   }

dune/common/mpihelper.hh

@@ -77,7 +77,7 @@ namespace Dune
     /**
      * @brief The type of the mpi communicator.
      */
-    typedef int MPICommunicator;
+    struct MPICommunicator {};
 
     /**
      * @brief Get the default communicator.
@@ -86,7 +86,7 @@ namespace Dune
      */
     static MPICommunicator getCommunicator()
     {
-      return -1;
+      return MPICommunicator();
     }
 
     static CollectiveCommunication<MPICommunicator>
@@ -208,7 +208,7 @@ namespace Dune
     {
       rank_ = -1;
       size_ = -1;
-      MPI_Init(&argc, &argv);
+      static int is_initialized = MPI_Init(&argc, &argv);
       MPI_Comm_rank(MPI_COMM_WORLD,&rank_);
       MPI_Comm_size(MPI_COMM_WORLD,&size_);
 

dune/common/test/fassigntest.cc

@@ -5,18 +5,20 @@
 #include <iostream>
 #include <dune/common/fvector.hh>
 #include <dune/common/fassign.hh>
+#include <dune/common/geometrytype.hh>
 
 using namespace Dune;
 
 int main(int argc, char** argv) try
 {
-  Dune::FieldVector<double,3> pos;
+  Dune::GeometryType t(Dune::GeometryType::cube, 4);
+  std::cout << t << "\n";
 
+  Dune::FieldVector<double,3> pos;
   pos <<= 1, 0, 0;
 
+  return 0;
 }
 catch (Exception e) {
-
   std::cout << e << std::endl;
-
 }

m4/dune_all.m4

@@ -9,6 +9,8 @@
 # dune-directory
 
 AC_DEFUN([DUNE_CHECK_ALL],[
+  # doxygen and latex take a lot of time...
+  AC_REQUIRE([DUNE_DOCUMENTATION])
   AC_REQUIRE([DUNE_WEB])
 
   AC_ARG_ENABLE(enabledist,

m4/dune_docu.m4

+# searches for documentation 
+AC_DEFUN([DUNE_DOCUMENTATION],[
+
+  # if dist has been build without
+  # documentation then disable documentation 
+  # option by default 
+  DOCU_TAG_FILE="no-documentation.tag"
+  AS_IF([test -f "doc/$DOCU_TAG_FILE"],[
+    HAS_DOCUMENTATION="no"],[
+    # check whether option is chosen or not 
+    AS_IF([test "x$enable_documentation" != "xno"],[
+      HAS_DOCUMENTATION="yes"],[
+      HAS_DOCUMENTATION="no"
+    ])
+  ])
+  AC_SUBST(DOCUMENTATION_TAG_FILE, $DOCU_TAG_FILE )
+  AC_ARG_ENABLE(documentation,
+   AS_HELP_STRING([--disable-documentation],[don\'t generate docs, speeds up the build]))
+  AM_CONDITIONAL(BUILD_DOCS, [test "x$HAS_DOCUMENTATION" = "xyes"])
+])