clang 3.7 related fixes

3rdparty/expreval/parser.cpp

@@ -7,6 +7,7 @@
 // Includes
 #include <new>
 #include <memory>
+#include <cstdlib>
 
 #include "defs.h"
 #include "parser.h"

src/ASM/ASMmxBase.C

@@ -16,6 +16,7 @@
 #include "GoTools/geometry/SurfaceInterpolator.h"
 #include "GoTools/trivariate/SplineVolume.h"
 #include "GoTools/trivariate/VolumeInterpolator.h"
+#include <numeric>
 
 char ASMmxBase::geoBasis            = 2;
 ASMmxBase::MixedType ASMmxBase::Type = ASMmxBase::FULL_CONT_RAISE_BASIS1;

src/ASM/ASMs2DC1.h

@@ -55,6 +55,7 @@ public:
   virtual void constrainEdge(int dir, bool open, int dof = 12, int code = 0,
                              char basis = 1);
 
+  using ASMs2D::constrainCorner;
   //! \brief Constrains a corner node identified by the two parameter indices.
   //! \param[in] I Parameter index in u-direction
   //! \param[in] J Parameter index in v-direction

src/ASM/ASMs2Dmx.C

@@ -28,6 +28,7 @@
 #include "Vec3Oper.h"
 #include "Vec3.h"
 #include <array>
+#include <numeric>
 #ifdef USE_OPENMP
 #include <omp.h>
 #endif

src/ASM/ASMs2DmxLag.C

@@ -24,6 +24,7 @@
 #include "GaussQuadrature.h"
 #include "Utilities.h"
 #include "Vec3Oper.h"
+#include <numeric>
 
 
 ASMs2DmxLag::ASMs2DmxLag (unsigned char n_s, const CharVec& n_f)

src/ASM/ASMs3Dmx.C

@@ -28,6 +28,7 @@
 #include "Vec3Oper.h"
 #include "Vec3.h"
 #include <array>
+#include <numeric>
 #ifdef USE_OPENMP
 #include <omp.h>
 #endif

src/ASM/ASMs3DmxLag.C

@@ -24,6 +24,7 @@
 #include "GaussQuadrature.h"
 #include "Utilities.h"
 #include "Vec3Oper.h"
+#include <numeric>
 
 
 ASMs3DmxLag::ASMs3DmxLag (const CharVec& n_f)

src/ASM/LR/ASMu2D.h

@@ -129,6 +129,7 @@ public:
   //! \param[in] dir Parameter direction to refine
   //! \param[in] nInsert Number of extra knots to insert in each knot-span
   virtual bool uniformRefine(int dir, int nInsert);
+  using ASMunstruct::refine;
   //! \brief Refines the parametrization by inserting extra tensor knots.
   //! \details This method is mainly kept for backward compatability with the
   //! "REFINE" keyword in the input file.

src/ASM/LR/ASMu2Dmx.h

@@ -160,6 +160,7 @@ public:
 				  const IntegrandBase& integrand,
 				  bool continuous = false) const;
 
+  using ASMu2D::refine;
   //! \brief Refines a set of elements based on a list of element errors.
   //! \param[in] elementError Element-wise errors
   //! \param[in] options Additional input parameters to control the refinement

src/ASM/LR/ASMu3D.h

@@ -102,6 +102,7 @@ public:
   //! \param[in] dir Parameter direction to refine
   //! \param[in] nInsert Number of extra knots to insert in each knot-span
   virtual bool uniformRefine(int dir, int nInsert);
+  using ASMunstruct::refine;
   //! \brief Refines the parametrization by inserting extra tensor knots.
   //! \param[in] dir Parameter direction to refine
   //! \param[in] xi Relative positions of added knots in each existing knot span

src/LinAlg/LinSolParams.h

@@ -99,7 +99,7 @@ public:
       postsmoother(BLANK_IF_NO_PETSC(PCILU)),
       mgKSP("defrichardson"),
       maxCoarseSize(-1),
-      subdomains({0,0,0})
+      subdomains({{0,0,0}})
 #ifdef HAS_PETSC
       , nullspace(NONE)
 #endif

src/SIM/SIM3D.C

@@ -22,6 +22,7 @@
 #endif
 #include <fstream>
 #include <sstream>
+#include <array>
 
 
 SIM3D::SIM3D (unsigned char n1, bool check)
@@ -789,14 +790,14 @@ ASMbase* SIM3D::createDefaultGeometry (const TiXmlElement* geo) const
             "2 2\n0 0 1 1\n");
 
   const std::array<std::array<double,3>,8> nodes =
-       {{{0.0,0.0,0.0},
-         {1.0,0.0,0.0},
-         {0.0,1.0,0.0},
-         {1.0,1.0,0.0},
-         {0.0,0.0,1.0},
-         {1.0,0.0,1.0},
-         {0.0,1.0,1.0},
-         {1.0,1.0,1.0}}};
+       {{{{0.0,0.0,0.0}},
+         {{1.0,0.0,0.0}},
+         {{0.0,1.0,0.0}},
+         {{1.0,1.0,0.0}},
+         {{0.0,0.0,1.0}},
+         {{1.0,0.0,1.0}},
+         {{0.0,1.0,1.0}},
+         {{1.0,1.0,1.0}}}};
   for (const auto& it : nodes)
   {
     std::stringstream str;

src/Utility/Test/TestCoordinateMapping.C

@@ -24,6 +24,7 @@
 
 #include "gtest/gtest.h"
 #include <fstream>
+#include <array>
 
 static Matrix readMatrix(size_t r, size_t c, const std::string& file)
 {