From 2da7fbff5c652fb08388c27be245c0224dc3f18f Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Mon, 2 Mar 2015 13:55:25 +0100 Subject: [PATCH] Make compile without C++11 --- examples/step-33/step-33.cc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/examples/step-33/step-33.cc b/examples/step-33/step-33.cc index c2854effd7..f153912aa0 100644 --- a/examples/step-33/step-33.cc +++ b/examples/step-33/step-33.cc @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -230,7 +231,7 @@ namespace Step33 template static void compute_flux_matrix (const InputVector &W, - std::array , EulerEquations::n_components > &flux) + std_cxx11::array , EulerEquations::n_components > &flux) { // First compute the pressure that appears in the flux matrix, and then // compute the first dim columns of the matrix that @@ -272,9 +273,9 @@ namespace Step33 const InputVector &Wplus, const InputVector &Wminus, const double alpha, - std::array < Number, n_components> &normal_flux) + std_cxx11::array < Number, n_components> &normal_flux) { - std::array , EulerEquations::n_components > iflux, oflux; + std_cxx11::array , EulerEquations::n_components > iflux, oflux; compute_flux_matrix (Wplus, iflux); compute_flux_matrix (Wminus, oflux); @@ -302,7 +303,7 @@ namespace Step33 template static void compute_forcing_vector (const InputVector &W, - std::array < Number, n_components> &forcing) + std_cxx11::array < Number, n_components> &forcing) { const double gravity = -1.0; @@ -1770,16 +1771,16 @@ namespace Step33 // later easily be computed from it: std::vector < - std::array , dim>, EulerEquations::n_components > + std_cxx11::array , dim>, EulerEquations::n_components > > flux(n_q_points); std::vector < - std::array , EulerEquations::n_components > + std_cxx11::array , EulerEquations::n_components > > flux_old(n_q_points); - std::vector < std::array< Sacado::Fad::DFad, EulerEquations::n_components> > forcing(n_q_points); + std::vector < std_cxx11::array< Sacado::Fad::DFad, EulerEquations::n_components> > forcing(n_q_points); - std::vector < std::array< double, EulerEquations::n_components> > forcing_old(n_q_points); + std::vector < std_cxx11::array< double, EulerEquations::n_components> > forcing_old(n_q_points); for (unsigned int q=0; q, EulerEquations::n_components> > normal_fluxes(n_q_points); - std::vector< std::array < double, EulerEquations::n_components> > normal_fluxes_old(n_q_points); + std::vector< std_cxx11::array < Sacado::Fad::DFad, EulerEquations::n_components> > normal_fluxes(n_q_points); + std::vector< std_cxx11::array < double, EulerEquations::n_components> > normal_fluxes_old(n_q_points); double alpha; -- 2.39.5