From 781440edc8b9f29e1cc9194a9776068bdce32a4b Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Thu, 7 Feb 2008 08:05:58 +0000 Subject: [PATCH] warning C4715: 'ColladaConverter::findGeometry' : not all control paths return a value temp fix for snprintf, _snprintf under WIN32 --- Extras/BulletColladaConverter/ColladaConverter.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Extras/BulletColladaConverter/ColladaConverter.cpp b/Extras/BulletColladaConverter/ColladaConverter.cpp index 502c50355..5e7bda637 100644 --- a/Extras/BulletColladaConverter/ColladaConverter.cpp +++ b/Extras/BulletColladaConverter/ColladaConverter.cpp @@ -46,6 +46,9 @@ subject to the following restrictions: #include "BulletCollision/CollisionShapes/btCompoundShape.h" #include "LinearMath/btDefaultMotionState.h" +#ifdef WIN32 +#define snprintf _snprintf +#endif #define BT_RIGIDBODY_COLLADA_INFO_TYPE 0xdeed class btRigidBodyColladaInfo : public btTypedUserInfo @@ -791,6 +794,7 @@ ColladaConverter::findGeometry (btCollisionShape* shape) btShapeColladaInfo* sci = (btShapeColladaInfo*)tui; return sci->m_geometry; } + return 0; } @@ -1174,6 +1178,8 @@ ColladaConverter::getDefaultPhysicsScene () return physicsScene; } + return 0; + } @@ -1196,6 +1202,7 @@ ColladaConverter::getDefaultVisualScene () return visualScene; } + return 0; }