Remove build warning at gcc-13

Remove build warning when we build dali-csharp-binder by gcc-13

Change-Id: Ib331ca7ce62ff54d0db5311bcf9420e1b6e1cd0e
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>

diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h
index 28733fa..76a7a33 100644 (file)
--- a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h
@@ -46,6 +46,8 @@ protected:
        // let each deformable body knows which solver body is in constact
        void pairDeformableAndSolverBody(btCollisionObject** bodies, int numBodies, int numDeformableBodies, const btContactSolverInfo& infoGlobal);
 
+       // Modified by Samsung to compile under GCC13. 2024-01-10. eunkiki.hong@samsung.com
+       using btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySplitImpulseIterations;
        virtual void solveGroupCacheFriendlySplitImpulseIterations(btCollisionObject * *bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);
 
        virtual btScalar solveDeformableGroupIterations(btCollisionObject * *bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer);

diff --git a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h
index 5971ecd..39af3e5 100644 (file)
--- a/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h
+++ b/dali-physics/third-party/bullet3/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h
@@ -62,6 +62,8 @@ protected:
 
        void positionCorrection(btScalar timeStep);
 
+       // Modified by Samsung to compile under GCC13. 2024-01-10. eunkiki.hong@samsung.com
+       using btMultiBodyDynamicsWorld::solveConstraints;
        void solveConstraints(btScalar timeStep);
 
        void updateActivationState(btScalar timeStep);