Commit 2c7ef689 authored by David Moxey's avatar David Moxey

Merge branch 'fix/boost-clang-error' into 'master'

Fix issue with std::placeholders vs boost::placeholders

See merge request !940
parents e90793d6 c323adda
......@@ -12,6 +12,7 @@ v5.0.0
- Use chrono in Timer (!807)
- Fix caching of FUNCTION tags that read from file and provide the same
functionality in FUNCTIONs defined for forcings (!759)
- Transition to C++11 (!795, !847)
- Add patch to tinyxml to fix size_t vs int bug (!820)
- Add ARPACK thirdparty build capabilities (!828)
- Added native support for csv files in addititon to pts (!760, !835, !906)
......@@ -51,7 +52,8 @@ v5.0.0
- Fix naming issue of duplicate Unit tests (!924)
- Fix warnings about missing virtual destructors in abstract classes (!932)
- Added a coupling interface to exchange data between solvers at run time
and a DummySolver to test the implementations (!853 !931)
and a DummySolver to test the implementations (!853, !931)
- Fix compilation issue with newer Boost versions and clang (!940)
**NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731)
......
......@@ -66,55 +66,55 @@ namespace Nektar
BLPoints(const PointsKey &key):PointsBaseType(key)
{
using namespace std::placeholders;
namespace pl = std::placeholders;
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussGaussLegendre),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussRadauMLegendre),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussRadauPLegendre),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussLobattoLegendre),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussGaussChebyshev),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussRadauMChebyshev),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussRadauPChebyshev),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussLobattoChebyshev),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussRadauMAlpha0Beta1),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussRadauMAlpha0Beta2),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussRadauMAlpha1Beta0),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eGaussRadauMAlpha2Beta0),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, ePolyEvenlySpaced),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eFourierEvenlySpaced),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eBoundaryLayerPoints),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(
PointsKey(0, eBoundaryLayerPointsRev),
std::bind(&BLPoints::CreateMatrix, this, _1));
std::bind(&BLPoints::CreateMatrix, this, pl::_1));
}
private:
......
......@@ -62,35 +62,35 @@ namespace Nektar
FourierPoints(const PointsKey &key):PointsBaseType(key)
{
using namespace std::placeholders;
namespace pl = std::placeholders;
m_InterpManager.RegisterCreator(PointsKey(0, eGaussGaussLegendre),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMLegendre),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauPLegendre),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussLobattoLegendre),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussGaussChebyshev),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMChebyshev),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauPChebyshev),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussLobattoChebyshev),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha0Beta1),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha0Beta2),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha1Beta0),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha2Beta0),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, ePolyEvenlySpaced),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eFourierEvenlySpaced),
std::bind(&FourierPoints::CreateMatrix, this, _1));
std::bind(&FourierPoints::CreateMatrix, this, pl::_1));
}
private:
......
......@@ -61,37 +61,37 @@ namespace Nektar
FourierSingleModePoints(const PointsKey &key):PointsBaseType(key)
{
using namespace std::placeholders;
namespace pl = std::placeholders;
m_InterpManager.RegisterCreator(PointsKey(0, eGaussGaussLegendre),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMLegendre),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauPLegendre),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussLobattoLegendre),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussGaussChebyshev),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMChebyshev),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauPChebyshev),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussLobattoChebyshev),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha0Beta1),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha0Beta2),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha1Beta0),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha2Beta0),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, ePolyEvenlySpaced),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eFourierEvenlySpaced),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eFourierSingleModeSpaced),
std::bind(&FourierSingleModePoints::CreateMatrix, this, _1));
std::bind(&FourierSingleModePoints::CreateMatrix, this, pl::_1));
}
private:
......
......@@ -68,87 +68,87 @@ namespace Nektar
GaussPoints(const PointsKey &pkey):PointsBaseType(pkey)
{
using namespace std::placeholders;
namespace pl = std::placeholders;
m_InterpManager.RegisterCreator(PointsKey(0, eGaussGaussLegendre),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMLegendre),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauPLegendre),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussLobattoLegendre),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussGaussChebyshev),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMChebyshev),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauPChebyshev),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussLobattoChebyshev),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha0Beta1),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha0Beta2),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha1Beta0),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha2Beta0),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussKronrodLegendre),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauKronrodMLegendre),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussRadauKronrodMAlpha1Beta0),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eGaussLobattoKronrodLegendre),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eFourierEvenlySpaced),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, ePolyEvenlySpaced),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eBoundaryLayerPoints),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_InterpManager.RegisterCreator(PointsKey(0, eBoundaryLayerPointsRev),
std::bind(&GaussPoints::CreateMatrix, this, _1));
std::bind(&GaussPoints::CreateMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussGaussLegendre),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauMLegendre),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauPLegendre),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussLobattoLegendre),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussGaussChebyshev),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauMChebyshev),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauPChebyshev),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussLobattoChebyshev),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha0Beta1),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha0Beta2),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha1Beta0),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauMAlpha2Beta0),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussKronrodLegendre),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauKronrodMLegendre),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussRadauKronrodMAlpha1Beta0),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eGaussLobattoKronrodLegendre),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eFourierEvenlySpaced),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, ePolyEvenlySpaced),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eBoundaryLayerPoints),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
m_GalerkinProjectionManager.RegisterCreator(PointsKey(0, eBoundaryLayerPointsRev),
std::bind(&GaussPoints::CreateGPMatrix, this, _1));
std::bind(&GaussPoints::CreateGPMatrix, this, pl::_1));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment