Changeset 2014 for code/branches/core3/src/util/MathConvert.h

Timestamp:

Oct 26, 2008, 12:35:58 AM (17 years ago)

Author:

rgrieder

Message:

Added convert test for gcc.

File:

• code/branches/core3/src/util/MathConvert.h (modified) (2 diffs)

code/branches/core3/src/util/MathConvert.h

@@ -37 +37 @@
 
 #include "UtilPrereqs.h"
+#include "Math.h"
 #include "Convert.h"
-#include "Math.h"
 
 
@@ -153 +153 @@
 // From Radian
 template <class ToType>
-inline bool fallbackConversion(ToType* output, const orxonox::Radian input)
-{
-    return convertValue<ToType, Ogre::Real>(output, input.valueRadians()); 
-}
+struct ConverterFallback<ToType, orxonox::Radian>
+{
+    static bool convert(ToType* output, const orxonox::Radian& input)
+    {
+        return convertValue<ToType, Ogre::Real>(output, input.valueRadians());
+    }
+};
 
 // From Degree
 template <class ToType>
-inline bool fallbackConversion(ToType* output, const orxonox::Degree input)
-{
-    return convertValue<ToType, Ogre::Real>(output, input.valueDegrees()); 
-}
+struct ConverterFallback<ToType, orxonox::Degree>
+{
+    static bool convert(ToType* output, const orxonox::Degree& input)
+    {
+        return convertValue<ToType, Ogre::Real>(output, input.valueDegrees());
+    }
+};
 
 // To Radian
 template <class FromType>
-inline bool fallbackConversion(orxonox::Radian* output, const FromType input)
-{
-    float temp;
-    if (convertValue(&temp, input))
-    {
-        *output = temp;
-        return true;
-    }
-    else
-        return false;
-}
+struct ConverterFallback<orxonox::Radian, FromType>
+{
+    static bool convert(orxonox::Radian* output, const FromType& input)
+    {
+        float temp;
+        if (convertValue(&temp, input))
+        {
+            *output = temp;
+            return true;
+        }
+        else
+            return false;
+    }
+};
 
 // To Degree
 template <class FromType>
-inline bool fallbackConversion(orxonox::Degree* output, const FromType input)
-{
-    float temp;
-    if (convertValue(&temp, input))
-    {
-        *output = temp;
-        return true;
-    }
-    else
-        return false;
-}
+struct ConverterFallback<orxonox::Degree, FromType>
+{
+    static bool convert(orxonox::Degree* output, const FromType& input)
+    {
+        float temp;
+        if (convertValue(&temp, input))
+        {
+            *output = temp;
+            return true;
+        }
+        else
+            return false;
+    }
+};
 
 #endif /* _MathConvert_H__ */