From 0a7eeaeb48014357a7e84974769f258288d984ed Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Sun, 21 Aug 2016 19:32:14 +0200 Subject: [PATCH 1/4] Fix compilation error on gcc --- src/collision/broadphase/DynamicAABBTree.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/collision/broadphase/DynamicAABBTree.cpp b/src/collision/broadphase/DynamicAABBTree.cpp index de494f69..7efd86ac 100644 --- a/src/collision/broadphase/DynamicAABBTree.cpp +++ b/src/collision/broadphase/DynamicAABBTree.cpp @@ -32,7 +32,7 @@ using namespace reactphysics3d; // Initialization of static variables -constexpr int TreeNode::NULL_TREE_NODE = -1; +const int TreeNode::NULL_TREE_NODE = -1; // Constructor DynamicAABBTree::DynamicAABBTree(decimal extraAABBGap) : mExtraAABBGap(extraAABBGap) { From 6f8d9586c7ba78cc17b57ffb49f4618984235006 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Sun, 21 Aug 2016 20:25:50 +0200 Subject: [PATCH 2/4] Fix compilation error on gcc --- src/constraint/BallAndSocketJoint.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constraint/BallAndSocketJoint.cpp b/src/constraint/BallAndSocketJoint.cpp index 497a45dc..7a5fce1b 100644 --- a/src/constraint/BallAndSocketJoint.cpp +++ b/src/constraint/BallAndSocketJoint.cpp @@ -30,7 +30,7 @@ using namespace reactphysics3d; // Static variables definition -constexpr decimal BallAndSocketJoint::BETA = decimal(0.2); +const decimal BallAndSocketJoint::BETA = decimal(0.2); // Constructor BallAndSocketJoint::BallAndSocketJoint(const BallAndSocketJointInfo& jointInfo) From 123cd93f387b7a0ea813e29c293e0ad81f1f8540 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Sun, 21 Aug 2016 20:37:58 +0200 Subject: [PATCH 3/4] Fix compilation error on gcc --- src/constraint/FixedJoint.cpp | 2 +- src/constraint/HingeJoint.cpp | 2 +- src/constraint/SliderJoint.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constraint/FixedJoint.cpp b/src/constraint/FixedJoint.cpp index 9ed31f01..8f0b105c 100644 --- a/src/constraint/FixedJoint.cpp +++ b/src/constraint/FixedJoint.cpp @@ -30,7 +30,7 @@ using namespace reactphysics3d; // Static variables definition -constexpr decimal FixedJoint::BETA = decimal(0.2); +const decimal FixedJoint::BETA = decimal(0.2); // Constructor FixedJoint::FixedJoint(const FixedJointInfo& jointInfo) diff --git a/src/constraint/HingeJoint.cpp b/src/constraint/HingeJoint.cpp index 4b152caa..1634bf27 100644 --- a/src/constraint/HingeJoint.cpp +++ b/src/constraint/HingeJoint.cpp @@ -31,7 +31,7 @@ using namespace reactphysics3d; // Static variables definition -constexpr decimal HingeJoint::BETA = decimal(0.2); +const decimal HingeJoint::BETA = decimal(0.2); // Constructor HingeJoint::HingeJoint(const HingeJointInfo& jointInfo) diff --git a/src/constraint/SliderJoint.cpp b/src/constraint/SliderJoint.cpp index efe7cbff..919d91c0 100644 --- a/src/constraint/SliderJoint.cpp +++ b/src/constraint/SliderJoint.cpp @@ -29,7 +29,7 @@ using namespace reactphysics3d; // Static variables definition -constexpr decimal SliderJoint::BETA = decimal(0.2); +const decimal SliderJoint::BETA = decimal(0.2); // Constructor SliderJoint::SliderJoint(const SliderJointInfo& jointInfo) From 2f195c61066c71dc45c5570709b0e78a61888fa0 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Sun, 21 Aug 2016 20:44:29 +0200 Subject: [PATCH 4/4] Fix compilation error on gcc --- src/engine/ContactSolver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/ContactSolver.cpp b/src/engine/ContactSolver.cpp index a11cc2e9..331e8045 100644 --- a/src/engine/ContactSolver.cpp +++ b/src/engine/ContactSolver.cpp @@ -34,9 +34,9 @@ using namespace reactphysics3d; using namespace std; // Constants initialization -constexpr decimal ContactSolver::BETA = decimal(0.2); -constexpr decimal ContactSolver::BETA_SPLIT_IMPULSE = decimal(0.2); -constexpr decimal ContactSolver::SLOP= decimal(0.01); +const decimal ContactSolver::BETA = decimal(0.2); +const decimal ContactSolver::BETA_SPLIT_IMPULSE = decimal(0.2); +const decimal ContactSolver::SLOP= decimal(0.01); // Constructor ContactSolver::ContactSolver(const std::map& mapBodyToVelocityIndex)