Changeset 7621 for code/branches/ois_update/src/libraries/tools/BulletConversions.h

Timestamp:

Nov 6, 2010, 3:05:53 PM (14 years ago)

Author:

rgrieder

Message:

Renamed FORCEINLINE macro to ORX_FORCEINLINE because of conflicts (resulting in a load of warnings with Ogre v1.7 and gcc) with OgrePlatform.h.

File:

• code/branches/ois_update/src/libraries/tools/BulletConversions.h (modified) (4 diffs)

code/branches/ois_update/src/libraries/tools/BulletConversions.h

@@ -43 +43 @@
     struct ConverterExplicit<orxonox::Vector3, btVector3>
     {
-        FORCEINLINE static bool convert(btVector3* output, const orxonox::Vector3& input)
+        ORX_FORCEINLINE static bool convert(btVector3* output, const orxonox::Vector3& input)
         {
             output->setX(input.x);
@@ -56 +56 @@
     struct ConverterExplicit<btVector3, orxonox::Vector3>
     {
-        FORCEINLINE static bool convert(orxonox::Vector3* output, const btVector3& input)
+        ORX_FORCEINLINE static bool convert(orxonox::Vector3* output, const btVector3& input)
         {
             output->x = input.x();
@@ -69 +69 @@
     struct ConverterExplicit<orxonox::Quaternion, btQuaternion>
     {
-        FORCEINLINE static bool convert(btQuaternion* output, const orxonox::Quaternion& input)
+        ORX_FORCEINLINE static bool convert(btQuaternion* output, const orxonox::Quaternion& input)
         {
             output->setW(input.w);
@@ -83 +83 @@
     struct ConverterExplicit<btQuaternion, orxonox::Quaternion>
     {
-        FORCEINLINE static bool convert(orxonox::Quaternion* output, const btQuaternion& input)
+        ORX_FORCEINLINE static bool convert(orxonox::Quaternion* output, const btQuaternion& input)
         {
             output->w = input.w();