Changeset 10546 for code/trunk

Timestamp:

Jul 30, 2015, 2:13:21 PM (9 years ago)

Author:

muemart

Message:

Fix MSVC14/Visual Studio 2015 build: std::less must be constexpr

File:

• code/trunk/src/libraries/tools/TextureGenerator.cc (modified) (1 diff)

code/trunk/src/libraries/tools/TextureGenerator.cc

@@ -39 +39 @@
 #include "util/Math.h"
 
+#if _MSC_VER >= 1900
+#define STLSPEC constexpr
+#else
+#define STLSPEC inline
+#endif
+
 namespace std
 {
     template <>
-    inline bool less<orxonox::ColourValue>::operator()(const orxonox::ColourValue& __x, const orxonox::ColourValue& __y) const
+    STLSPEC bool less<orxonox::ColourValue>::operator()(const orxonox::ColourValue& __x, const orxonox::ColourValue& __y) const
     {
-        if (__x.r == __y.r)
-        {
-            if (__x.g == __y.g)
-            {
-                if (__x.b == __y.b)
-                {
-                    return __x.a < __y.a;
-                }
-                return __x.b < __y.b;
-            }
-            return __x.g < __y.g;
-        }
-        return __x.r < __y.r;
+        //MSVC14 needs this function to be constexpr, but doesn't support C++14's style
+        //Keep the old code around for superior readability
+        //if (__x.r == __y.r)
+        //{
+        //    if (__x.g == __y.g)
+        //    {
+        //        if (__x.b == __y.b)
+        //        {
+        //            return __x.a < __y.a;
+        //        }
+        //        return __x.b < __y.b;
+        //    }
+        //    return __x.g < __y.g;
+        //}
+        //return __x.r < __y.r;
+        return __x.r == __y.r ? __x.g == __y.g ? __x.b == __y.b ? __x.a < __y.a : __x.b < __y.b : __x.g < __y.g :  __x.r < __y.r;
     }
 }