Changeset 7266 for code/trunk/src/libraries

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

Files:

• core/Core.h (modified) (1 diff)
• core/CorePrecompiledHeaders.h (modified) (1 diff)
• core/Game.cc (modified) (1 diff)
• core/Game.h (modified) (1 diff)
• core/Identifier.h (modified) (1 diff)
• core/LuaState.cc (modified) (1 diff)
• core/LuaState.h (modified) (1 diff)
• core/input/InputManager.cc (modified) (1 diff)
• network/NetworkPrecompiledHeaders.h (modified) (1 diff)
• network/synchronisable/Serialise.h (modified) (1 diff)
• network/synchronisable/SynchronisableVariable.h (modified) (1 diff)
• util/Convert.h (modified) (5 diffs)
• util/MultiType.h (modified) (1 diff)
• util/Scope.h (modified) (1 diff)

code/trunk/src/libraries/core/Core.h

@@ -36 +36 @@
 #include <string>
 #include <boost/scoped_ptr.hpp>
-#include "util/ScopeGuard.h"
+#include <loki/ScopeGuard.h>
+
 #include "util/Singleton.h"
 #include "OrxonoxClass.h"

code/trunk/src/libraries/core/CorePrecompiledHeaders.h

@@ -57 +57 @@
 #include <cmath>    // 42
 
-#include "util/ScopeGuard.h" // 38
+#include <loki/ScopeGuard.h> // 38
 
 #include <OgreMath.h>        // 36

code/trunk/src/libraries/core/Game.cc

@@ -37 +37 @@
 #include <exception>
 #include <boost/weak_ptr.hpp>
+#include <loki/ScopeGuard.h>
 
 #include "util/Clock.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
-#include "util/ScopeGuard.h"
 #include "util/Sleep.h"
 #include "util/SubString.h"

code/trunk/src/libraries/core/Game.h

@@ -46 +46 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/preprocessor/cat.hpp>
+#include <loki/ScopeGuard.h>
 
 #include "util/Debug.h"
-#include "util/ScopeGuard.h"
 #include "util/Singleton.h"
 #include "OrxonoxClass.h"

code/trunk/src/libraries/core/Identifier.h

@@ -57 +57 @@
 #include <string>
 #include <typeinfo>
+#include <loki/TypeTraits.h>
 
 #include "util/Debug.h"
-#include "util/TypeTraits.h"
 #include "MetaObjectList.h"
 #include "ObjectList.h"

code/trunk/src/libraries/core/LuaState.cc

@@ -35 +35 @@
 #include <lualib.h>
 }
+#include <loki/ScopeGuard.h>
 
 #include "util/Debug.h"
 #include "util/Exception.h"
-#include "util/ScopeGuard.h"
 #include "IOConsole.h"
 #include "Resource.h"

code/trunk/src/libraries/core/LuaState.h

@@ -38 +38 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
+#include <loki/ScopeGuard.h>
 
-#include "util/ScopeGuard.h"
 #include "Functor.h"
 #include "ToluaInterface.h"

code/trunk/src/libraries/core/input/InputManager.cc

@@ -40 +40 @@
 #include <ois/OISInputManager.h>
 #include <boost/foreach.hpp>
+#include <loki/ScopeGuard.h>
 
 #include "util/Clock.h"
 #include "util/Convert.h"
 #include "util/Exception.h"
-#include "util/ScopeGuard.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"

code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h

@@ -53 +53 @@
 
 #include "util/Debug.h"      // 20
-#include "util/TypeTraits.h" // 18
+#include <loki/TypeTraits.h> // 18
 
 #ifdef ORXONOX_COMPILER_MSVC

code/trunk/src/libraries/network/synchronisable/Serialise.h

@@ -35 +35 @@
 #define _NetworkSerialise_H__
 
+#include "network/NetworkPrereqs.h"
+
+#include <loki/TypeTraits.h>
+
 #include "util/Serialise.h"
-#include "util/TypeTraits.h"
 #include "core/CorePrereqs.h"
 #include "core/CoreIncludes.h"

code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h

@@ -35 +35 @@
 #include <cassert>
 #include <cstring>
+#include <loki/TypeTraits.h>
+
 #include "Serialise.h"
-#include "util/TypeTraits.h"
 #include "core/GameMode.h"
 #include "network/synchronisable/NetworkCallbackManager.h"

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