Changeset 6137 for code

Timestamp:

Nov 24, 2009, 3:11:31 AM (15 years ago)

Author:

landauf

Message:

Ogre introduced overloadings of the << operator for Radian and Degree in version 1.6.3
So exclude our own implementation of this if the version is greater or equal.

Location:

code/branches/presentation2/src/libraries/util

Files:

• Math.cc (modified) (3 diffs)
• Math.h (modified) (1 diff)

code/branches/presentation2/src/libraries/util/Math.cc

@@ -43 +43 @@
 namespace orxonox
 {
+#if OGRE_VERSION < 0x010603
     /**
         @brief Function for writing a Radian to a stream.
@@ -51 +52 @@
         return out;
     }
+
+    /**
+        @brief Function for writing a Degree to a stream.
+    */
+    std::ostream& operator<<(std::ostream& out, const orxonox::Degree& degree)
+    {
+        out << degree.valueDegrees();
+        return out;
+    }
+#endif
 
     /**
@@ -61 +72 @@
         radian = temp;
         return in;
-    }
-
-    /**
-        @brief Function for writing a Degree to a stream.
-    */
-    std::ostream& operator<<(std::ostream& out, const orxonox::Degree& degree)
-    {
-        out << degree.valueDegrees();
-        return out;
     }
 

code/branches/presentation2/src/libraries/util/Math.h

@@ -59 +59 @@
 namespace orxonox
 {
+#if OGRE_VERSION < 0x010603
     _UtilExport std::ostream& operator<<(std::ostream& out, const orxonox::Radian& radian);
+    _UtilExport std::ostream& operator<<(std::ostream& out, const orxonox::Degree& degree);
+#endif
     _UtilExport std::istream& operator>>(std::istream& in, orxonox::Radian& radian);
-    _UtilExport std::ostream& operator<<(std::ostream& out, const orxonox::Degree& degree);
     _UtilExport std::istream& operator>>(std::istream& in, orxonox::Degree& degree);