diff --git a/src/BulletSoftBody/btCGProjection.h b/src/BulletSoftBody/btCGProjection.h index b4a887fa6..ca7417f8f 100644 --- a/src/BulletSoftBody/btCGProjection.h +++ b/src/BulletSoftBody/btCGProjection.h @@ -104,9 +104,12 @@ class btCGProjection { public: // static const int dim = 3; - using TVStack = btAlignedObjectArray; - using TVArrayStack = btAlignedObjectArray >; - using TArrayStack = btAlignedObjectArray >; + typedef btAlignedObjectArray TVStack; + typedef btAlignedObjectArray > TVArrayStack; + typedef btAlignedObjectArray > TArrayStack; +// using TVStack = btAlignedObjectArray; +// using TVArrayStack = btAlignedObjectArray >; +// using TArrayStack = btAlignedObjectArray >; btAlignedObjectArray m_softBodies; btDeformableRigidDynamicsWorld* m_world; const std::unordered_map* m_indices; diff --git a/src/BulletSoftBody/btConjugateGradient.h b/src/BulletSoftBody/btConjugateGradient.h index 0c8384a00..fdef6b22d 100644 --- a/src/BulletSoftBody/btConjugateGradient.h +++ b/src/BulletSoftBody/btConjugateGradient.h @@ -15,7 +15,8 @@ template class btConjugateGradient { - using TVStack = btAlignedObjectArray; +// using TVStack = btAlignedObjectArray; + typedef btAlignedObjectArray TVStack; TVStack r,p,z,temp; int max_iterations; diff --git a/src/BulletSoftBody/btDeformableBackwardEulerObjective.h b/src/BulletSoftBody/btDeformableBackwardEulerObjective.h index a736315b7..22a685631 100644 --- a/src/BulletSoftBody/btDeformableBackwardEulerObjective.h +++ b/src/BulletSoftBody/btDeformableBackwardEulerObjective.h @@ -20,7 +20,8 @@ class btDeformableRigidDynamicsWorld; class btDeformableBackwardEulerObjective { public: - using TVStack = btAlignedObjectArray; +// using TVStack = btAlignedObjectArray; + typedef btAlignedObjectArray TVStack; btScalar m_dt; btDeformableRigidDynamicsWorld* m_world; btAlignedObjectArray m_lf; diff --git a/src/BulletSoftBody/btDeformableBodySolver.h b/src/BulletSoftBody/btDeformableBodySolver.h index d721869a1..5528d8f84 100644 --- a/src/BulletSoftBody/btDeformableBodySolver.h +++ b/src/BulletSoftBody/btDeformableBodySolver.h @@ -21,7 +21,8 @@ class btDeformableRigidDynamicsWorld; class btDeformableBodySolver : public btSoftBodySolver { - using TVStack = btAlignedObjectArray; +// using TVStack = btAlignedObjectArray; + typedef btAlignedObjectArray TVStack; protected: int m_numNodes; TVStack m_dv; diff --git a/src/BulletSoftBody/btDeformableGravityForce.h b/src/BulletSoftBody/btDeformableGravityForce.h index 398662e1f..88d9107e1 100644 --- a/src/BulletSoftBody/btDeformableGravityForce.h +++ b/src/BulletSoftBody/btDeformableGravityForce.h @@ -13,7 +13,8 @@ class btDeformableGravityForce : public btDeformableLagrangianForce { public: - using TVStack = btDeformableLagrangianForce::TVStack; +// using TVStack = btDeformableLagrangianForce::TVStack; + typedef btAlignedObjectArray TVStack; btVector3 m_gravity; btDeformableGravityForce(const btVector3& g) : m_gravity(g) diff --git a/src/BulletSoftBody/btDeformableLagrangianForce.h b/src/BulletSoftBody/btDeformableLagrangianForce.h index fa4184a14..ff75eeb1c 100644 --- a/src/BulletSoftBody/btDeformableLagrangianForce.h +++ b/src/BulletSoftBody/btDeformableLagrangianForce.h @@ -19,7 +19,8 @@ enum btDeformableLagrangianForceType class btDeformableLagrangianForce { public: - using TVStack = btAlignedObjectArray; +// using TVStack = btAlignedObjectArray; + typedef btAlignedObjectArray TVStack; btAlignedObjectArray m_softBodies; const std::unordered_map* m_indices; diff --git a/src/BulletSoftBody/btDeformableMassSpringForce.h b/src/BulletSoftBody/btDeformableMassSpringForce.h index 549985321..d3ccd70dc 100644 --- a/src/BulletSoftBody/btDeformableMassSpringForce.h +++ b/src/BulletSoftBody/btDeformableMassSpringForce.h @@ -13,7 +13,8 @@ class btDeformableMassSpringForce : public btDeformableLagrangianForce { public: - using TVStack = btDeformableLagrangianForce::TVStack; +// using TVStack = btDeformableLagrangianForce::TVStack; + typedef btAlignedObjectArray TVStack; btDeformableMassSpringForce() { } diff --git a/src/BulletSoftBody/btDeformableRigidDynamicsWorld.h b/src/BulletSoftBody/btDeformableRigidDynamicsWorld.h index c6b3dcbc6..779a88ee3 100644 --- a/src/BulletSoftBody/btDeformableRigidDynamicsWorld.h +++ b/src/BulletSoftBody/btDeformableRigidDynamicsWorld.h @@ -30,7 +30,8 @@ typedef btAlignedObjectArray btSoftBodyArray; class btDeformableRigidDynamicsWorld : public btMultiBodyDynamicsWorld { - using TVStack = btAlignedObjectArray; + typedef btAlignedObjectArray TVStack; +// using TVStack = btAlignedObjectArray; ///Solver classes that encapsulate multiple deformable bodies for solving btDeformableBodySolver* m_deformableBodySolver; btSoftBodyArray m_softBodies; diff --git a/src/BulletSoftBody/btPreconditioner.h b/src/BulletSoftBody/btPreconditioner.h index ad190a3a8..97cec43c5 100644 --- a/src/BulletSoftBody/btPreconditioner.h +++ b/src/BulletSoftBody/btPreconditioner.h @@ -11,7 +11,8 @@ class Preconditioner { public: - using TVStack = btAlignedObjectArray; + typedef btAlignedObjectArray TVStack; +// using TVStack = btAlignedObjectArray; virtual void operator()(const TVStack& x, TVStack& b) = 0; virtual void reinitialize(bool nodeUpdated) = 0; };