Use std::array instead of Dune::array.

dune/solvers/common/boxconstraint.hh

@@ -3,9 +3,9 @@
 #ifndef DUNE_BOX_CONSTRAINT_HH
 #define DUNE_BOX_CONSTRAINT_HH
 
+#include <array>
 #include <limits>
 
-#include <dune/common/array.hh>
 #include <dune/common/fvector.hh>
 
 template <class T, int dim>
@@ -63,7 +63,7 @@ public:
 
 protected:
 
-    Dune::array<T, 2*dim> val;
+    std::array<T, 2*dim> val;
 
 };
 

dune/solvers/common/interval.hh

@@ -3,13 +3,10 @@
 #ifndef DUNE_SOLVERS_COMMON_INTERVAL_HH
 #define DUNE_SOLVERS_COMMON_INTERVAL_HH
 
+#include <array>
 #include <iostream>
 #include <algorithm>
 
-
-
-#include <dune/common/array.hh>
-
 namespace Dune {
 
   namespace Solvers {
@@ -69,7 +66,7 @@ public:
 private:
     
     /** \brief The actual data */
-    Dune::array<field_type,2> data_;
+    std::array<field_type,2> data_;
 };
 
 //! Output operator for Interval

dune/solvers/iterationsteps/obstacletnnmgstep.hh

@@ -4,6 +4,7 @@
 #define OBSTACLE_TNNMG_STEP_HH
 
 // std includes
+#include <array>
 #include <vector>
 #include <algorithm>
 
@@ -200,7 +201,7 @@ class ObstacleTNNMGStep
             coarseCorrection_ = 0;
 
             // mark indices for truncation and count truncated indices per component
-            typename Dune::array<int, blockSize> truncationCount;
+            typename std::array<int, blockSize> truncationCount;
             truncationCount.fill(0);
             BitVector truncate(x.size(), false);
             for(size_t i=0; i<x.size(); ++i)

dune/solvers/test/mmgtest.cc

@@ -3,6 +3,7 @@
 
 #include <config.h>
 
+#include <array>
 #include <iostream>
 #include <sstream>
 
@@ -170,7 +171,7 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
     typedef Dune::YaspGrid<dim> GridType;
 
     typename Dune::FieldVector<typename GridType::ctype,dim> L(1.0);
-    typename Dune::array<int,dim> s;
+    typename std::array<int,dim> s;
     std::fill(s.begin(), s.end(), 1);
 
     GridType grid(L, s);

dune/solvers/test/obstacletnnmgtest.cc

@@ -3,6 +3,7 @@
 
 #include <config.h>
 
+#include <array>
 #include <iostream>
 #include <sstream>
 
@@ -171,7 +172,7 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
     typedef Dune::YaspGrid<dim> GridType;
 
     typename Dune::FieldVector<typename GridType::ctype,dim> L(1.0);
-    typename Dune::array<int,dim> s;
+    typename std::array<int,dim> s;
     std::fill(s.begin(), s.end(), 1);
 
     GridType grid(L, s);

dune/solvers/test/projectedgradienttest.cc

 #include <config.h>
 
+#include <array>
 #include <iostream>
 #include <sstream>
 
@@ -139,7 +140,7 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
     typedef Dune::YaspGrid<dim> GridType;
 
     typename Dune::FieldVector<typename GridType::ctype,dim> L(1.0);
-    typename Dune::array<int,dim> s;
+    typename std::array<int,dim> s;
     for (int i=0; i<dim; i++)
         s[i] = 1;
     std::bitset<dim> periodic(false);

dune/solvers/test/quadraticipoptsolvertest.cc

@@ -3,6 +3,7 @@
 
 #include <config.h>
 
+#include <array>
 #include <iostream>
 #include <sstream>
 
@@ -148,7 +149,7 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
     typedef Dune::YaspGrid<dim> GridType;
 
     typename Dune::FieldVector<typename GridType::ctype,dim> L(1.0);
-    typename Dune::array<int,dim> s;
+    typename std::array<int,dim> s;
     std::fill(s.begin(), s.end(), 1);
 
     GridType grid(L, s);