From 2523260f754e9a19ce0c48a44f84165c3613e095 Mon Sep 17 00:00:00 2001
From: Jacky Austermann <jaustermann@fas.harvard.edu>
Date: Fri, 12 May 2017 16:04:12 -0400
Subject: [PATCH] Compiler compatibility

---
 include/aspect/geometry_model/interface.h | 5 +++--
 source/geometry_model/interface.cc        | 6 +++---
 source/postprocess/stokes_residual.cc     | 2 +-
 source/utilities.cc                       | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/aspect/geometry_model/interface.h b/include/aspect/geometry_model/interface.h
index 398285d2763..aa6b31cd081 100644
--- a/include/aspect/geometry_model/interface.h
+++ b/include/aspect/geometry_model/interface.h
@@ -25,6 +25,7 @@
 #include <aspect/plugins.h>
 #include <deal.II/base/parameter_handler.h>
 #include <deal.II/distributed/tria.h>
+#include <deal.II/base/std_cxx11/array.h>
 
 #include <set>
 
@@ -137,7 +138,7 @@ namespace aspect
          * latitude) in 3d.
          */
         virtual
-        std::array<double,dim> cartesian_to_natural_coodinates(const Point<dim> &position) const;
+        std_cxx11::array<double,dim> cartesian_to_natural_coodinates(const Point<dim> &position) const;
 
         /**
          * Undoes the action of cartesian_to_natural_coodinates, and turns the
@@ -145,7 +146,7 @@ namespace aspect
          * Cartesian coordinates.
          */
         virtual
-        Point<dim> natural_to_cartesian_coodinates(const std::array<double,dim> &position) const;
+        Point<dim> natural_to_cartesian_coodinates(const std_cxx11::array<double,dim> &position) const;
 
         /**
          * Returns a representative point for a given depth. Such a point must
diff --git a/source/geometry_model/interface.cc b/source/geometry_model/interface.cc
index 36f491475ea..00a028fd942 100644
--- a/source/geometry_model/interface.cc
+++ b/source/geometry_model/interface.cc
@@ -65,18 +65,18 @@ namespace aspect
     }
 
     template <int dim>
-    std::array<double,dim>
+    std_cxx11::array<double,dim>
     Interface<dim>::cartesian_to_natural_coodinates(const Point<dim> &) const
     {
       Assert (false,
               ExcMessage ("The cartesian_to_natural_coodinates function has "
                           "not been implemented in this geometry model."));
-      return std::array<double,dim>();
+      return std_cxx11::array<double,dim>();
     }
 
     template <int dim>
     Point<dim>
-    Interface<dim>::natural_to_cartesian_coodinates(const std::array<double,dim> &) const
+    Interface<dim>::natural_to_cartesian_coodinates(const std_cxx11::array<double,dim> &) const
     {
       Assert (false,
               ExcMessage ("The natural_to_cartesian_coodinates function has "
diff --git a/source/postprocess/stokes_residual.cc b/source/postprocess/stokes_residual.cc
index f0d000d8054..b9db9c7e099 100644
--- a/source/postprocess/stokes_residual.cc
+++ b/source/postprocess/stokes_residual.cc
@@ -105,7 +105,7 @@ namespace aspect
 #endif
 
       // If there were expensive iterations add them after a signalling -1.
-      if ((solver_control_cheap.last_check() == SolverControl::State::failure)
+      if ((solver_control_cheap.last_check() == dealii::SolverControl::failure)
           && (solver_control_cheap.last_step() == solver_control_cheap.max_steps()))
         {
           data_point.values.push_back(-1.0);
diff --git a/source/utilities.cc b/source/utilities.cc
index 6aae2ec4d6b..593f053415e 100644
--- a/source/utilities.cc
+++ b/source/utilities.cc
@@ -1996,7 +1996,7 @@ namespace aspect
           const double sum_of_weights = std::accumulate(weights.begin(), weights.end(), 0);
           Assert (sum_of_weights != 0,
                   ExcMessage ("The sum of the weights may not be equal to zero, because we need to divide through it."));
-          return std::cbrt(averaged_parameter/sum_of_weights);
+          return cbrt(averaged_parameter/sum_of_weights);
         }
       else if (p >= 1000)
         {