Skip to content
Snippets Groups Projects
Commit 04bdaf06 authored by Dave Moxey's avatar Dave Moxey
Browse files

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

parent 2477c58d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
library/LibUtilities/Foundations/BLPoints.h
+ 17
− 17
View file @ 04bdaf06
......@@ -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:
......
library/LibUtilities/Foundations/FourierPoints.h
+ 15
− 15
View file @ 04bdaf06
......@@ -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:
......
library/LibUtilities/Foundations/FourierSingleModePoints.h
+ 16
− 16
View file @ 04bdaf06
......@@ -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:
......
library/LibUtilities/Foundations/GaussPoints.h
+ 41
− 41
View file @ 04bdaf06
......@@ -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));
}
......
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