Changeset 7266 for code/trunk/src/libraries/util

Timestamp:

Aug 30, 2010, 5:04:12 PM (14 years ago)

Author:

rgrieder

Message:

Moved Loki library files to separate loki folder in externals.
Also added TypeManip.h (now used in Convert.h) and static_check.h.

Location:

code/trunk/src/libraries/util

Files:

• Convert.h (modified) (5 diffs)
• MultiType.h (modified) (1 diff)
• Scope.h (modified) (1 diff)

code/trunk/src/libraries/util/Convert.h

@@ -41 +41 @@
 #include <sstream>
 #include <typeinfo>
+#include <loki/TypeManip.h>
 
 #include "Debug.h"
@@ -76 +77 @@
 namespace orxonox
 {
-    namespace detail
-    {
-        //! Little template that maps integers to entire types (Alexandrescu 2001)
-        template <int I>
-        struct Int2Type { };
-    }
-
-
     ///////////////////
     // No Conversion //
@@ -215 +208 @@
     // implicit cast not possible, try stringstream conversion next
     template <class FromType, class ToType>
-    FORCEINLINE bool convertImplicitely(ToType* output, const FromType& input, detail::Int2Type<false>)
+    FORCEINLINE bool convertImplicitely(ToType* output, const FromType& input, Loki::Int2Type<false>)
     {
         return ConverterStringStream<FromType, ToType>::convert(output, input);
@@ -222 +215 @@
     // We can cast implicitely
     template <class FromType, class ToType>
-    FORCEINLINE bool convertImplicitely(ToType* output, const FromType& input, detail::Int2Type<true>)
+    FORCEINLINE bool convertImplicitely(ToType* output, const FromType& input, Loki::Int2Type<true>)
     {
         (*output) = static_cast<ToType>(input);
@@ -242 +235 @@
             // Try implict cast and probe first. If a simple cast is not possible, it will not compile
             // We therefore have to out source it into another template function
-            return convertImplicitely(output, input, detail::Int2Type<probe>());
+            return convertImplicitely(output, input, Loki::Int2Type<probe>());
         }
     };

code/trunk/src/libraries/util/MultiType.h

@@ -76 +76 @@
 #include <OgreQuaternion.h>
 #include <OgreColourValue.h>
-
-#include "TypeTraits.h"
+#include <loki/TypeTraits.h>
 
 namespace orxonox

code/trunk/src/libraries/util/Scope.h

@@ -35 +35 @@
 #include <map>
 #include <set>
+#include <loki/ScopeGuard.h>
 
 #include "Debug.h"
-#include "ScopeGuard.h"
 
 namespace orxonox