Changeset 7266 for code/trunk/src/external

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/external

Files:

• CMakeLists.txt (modified) (1 diff)
• loki (added)
• loki/CHANGES (added)
• loki/CMakeLists.txt (added)
• loki/NullType.h (added)
• loki/README (added)
• loki/RefToValue.h (moved) (moved from code/trunk/src/libraries/util/RefToValue.h)
• loki/ScopeGuard.h (moved) (moved from code/trunk/src/libraries/util/ScopeGuard.h) (2 diffs)
• loki/TypeManip.h (added)
• loki/TypeTraits.h (moved) (moved from code/trunk/src/libraries/util/TypeTraits.h) (21 diffs)
• loki/changes_orxonox.txt (added)
• loki/static_check.h (added)

code/trunk/src/external/CMakeLists.txt

@@ -34 +34 @@
 ADD_SUBDIRECTORY(bullet)
 ADD_SUBDIRECTORY(cpptcl)
+ADD_SUBDIRECTORY(loki)
 ADD_SUBDIRECTORY(ogreceguirenderer)
 ADD_SUBDIRECTORY(ois)

code/trunk/src/external/loki/ScopeGuard.h

@@ -12 +12 @@
 //     suitability of this software for any purpose. It is provided "as is" 
 //     without express or implied warranty.
+//
+// Changes by Orxonox (Reto Grieder)
+//     Moved one protected variable to the public section to allow the use of
+//     the ScopeGuard in a class definition.
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef LOKI_SCOPEGUARD_INC_
@@ -19 +23 @@
 
 
-#include "RefToValue.h"
+#include <loki/RefToValue.h>
 
 /// \defgroup ExceptionGroup Exception-safe code

code/trunk/src/external/loki/TypeTraits.h

@@ -3 +3 @@
 // Copyright (c) 2001 by Andrei Alexandrescu
 // This code accompanies the book:
-// Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design 
+// Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
 //     Patterns Applied". Copyright (c) 2001. Addison-Wesley.
-// Permission to use, copy, modify, distribute and sell this software for any 
-//     purpose is hereby granted without fee, provided that the above copyright 
-//     notice appear in all copies and that both that copyright notice and this 
+// Permission to use, copy, modify, distribute and sell this software for any
+//     purpose is hereby granted without fee, provided that the above copyright
+//     notice appear in all copies and that both that copyright notice and this
 //     permission notice appear in supporting documentation.
-// The author or Addison-Wesley Longman make no representations about the 
-//     suitability of this software for any purpose. It is provided "as is" 
+// The author or Addison-Wesley Longman make no representations about the
+//     suitability of this software for any purpose. It is provided "as is"
 //     without express or implied warranty.
 //
-// Changes by Orxonox (Reto)
+// Changes by Orxonox (Reto Grieder)
 //     Removed all stdInt, etc. type traits and function pointer traits
 //     and added UnqualifiedReferredType.
@@ -20 +20 @@
 #define LOKI_TYPETRAITS_INC_
 
-// $Id: TypeTraits.h 835 2007-08-02 19:39:02Z syntheticpp $
-
+// $Id: TypeTraits.h 1069 2010-04-19 03:09:59Z rich_sposato $
+
+
+#include <loki/NullType.h>
 
 #if (defined _MSC_VER) && (_MSC_VER < 1400)
@@ -29 +31 @@
 
 #ifdef _MSC_VER
-#pragma warning( push ) 
+#pragma warning( push )
 #pragma warning( disable : 4180 ) //qualifier applied to function type has no meaning; ignored
 #endif
@@ -36 +38 @@
 {
 ////////////////////////////////////////////////////////////////////////////////
-// class NullType
-// Used as a placeholder for "no type here"
-// Useful as an end marker in typelists 
-////////////////////////////////////////////////////////////////////////////////
-
-    class NullType {};
-
-////////////////////////////////////////////////////////////////////////////////
 // class template IsCustomUnsignedInt
 // Offers a means to integrate nonstandard built-in unsigned integral types
-// (such as unsigned __int64 or unsigned long long int) with the TypeTraits 
+// (such as unsigned __int64 or unsigned long long int) with the TypeTraits
 //     class template defined below.
 // Invocation: IsCustomUnsignedInt<T> where T is any type
@@ -59 +53 @@
     {
         enum { value = 0 };
-    };        
+    };
 
 ////////////////////////////////////////////////////////////////////////////////
 // class template IsCustomSignedInt
 // Offers a means to integrate nonstandard built-in unsigned integral types
-// (such as unsigned __int64 or unsigned long long int) with the TypeTraits 
+// (such as unsigned __int64 or unsigned long long int) with the TypeTraits
 //     class template defined below.
 // Invocation: IsCustomSignedInt<T> where T is any type
@@ -77 +71 @@
     {
         enum { value = 0 };
-    };        
+    };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -94 +88 @@
     {
         enum { value = 0 };
-    };        
+    };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -142 +136 @@
         };
     }// namespace Private
-        
+
 ////////////////////////////////////////////////////////////////////////////////
 // class template TypeTraits
@@ -150 +144 @@
 //
 // - isPointer       : returns true if T is a pointer type
-// - PointeeType     : returns the type to which T points if T is a pointer 
+// - PointeeType     : returns the type to which T points if T is a pointer
 //                     type, NullType otherwise
 // - isReference     : returns true if T is a reference type
-// - ReferredType    : returns the type to which T refers if T is a reference 
+// - ReferredType    : returns the type to which T refers if T is a reference
 //                     type, NullType otherwise
-// - ParameterType   : returns the optimal type to be used as a parameter for 
+// - ParameterType   : returns the optimal type to be used as a parameter for
 //                     functions that take Ts
 // - isConst         : returns true if T is a const-qualified type
@@ -161 +155 @@
 // - isVolatile      : returns true if T is a volatile-qualified type
 // - NonVolatileType : Type with removed 'volatile' qualifier from T, if any
-// - UnqualifiedType : Type with removed 'const' and 'volatile' qualifiers from 
+// - UnqualifiedType : Type with removed 'const' and 'volatile' qualifiers from
 //                     T, if any
-// - ParameterType   : returns the optimal type to be used as a parameter 
+// - ParameterType   : returns the optimal type to be used as a parameter
 //                       for functions that take 'const T's
 //
@@ -172 +166 @@
     {
     private:
-    
+
         template <class U> struct ReferenceTraits
         {
@@ -178 +172 @@
             typedef U ReferredType;
         };
-        
+
         template <class U> struct ReferenceTraits<U&>
         {
@@ -184 +178 @@
             typedef U ReferredType;
         };
-               
+
         template <class U> struct PointerTraits
         {
@@ -190 +184 @@
             typedef NullType PointeeType;
         };
-        
+
         template <class U> struct PointerTraits<U*>
         {
@@ -196 +190 @@
             typedef U PointeeType;
         };
-        
+
         template <class U> struct PointerTraits<U*&>
         {
@@ -202 +196 @@
             typedef U PointeeType;
         };
-          
+
         template <class U> struct PToMTraits
         {
             enum { result = false };
         };
-        
+
         template <class U, class V> struct PToMTraits<U V::*>
         {
             enum { result = true };
         };
-        
+
         template <class U, class V> struct PToMTraits<U V::*&>
         {
             enum { result = true };
         };
-        
+
         template <class U> struct UnConst
         {
@@ -223 +217 @@
             enum { isConst = 0 };
         };
-        
+
         template <class U> struct UnConst<const U>
         {
@@ -235 +229 @@
             enum { isConst = 1 };
         };
-  
+
         template <class U> struct UnVolatile
         {
@@ -241 +235 @@
             enum { isVolatile = 0 };
         };
-       
+
         template <class U> struct UnVolatile<volatile U>
         {
@@ -253 +247 @@
             enum { isVolatile = 1 };
         };
-        
+
     public:
-        typedef typename UnConst<T>::Result 
+        typedef typename UnConst<T>::Result
             NonConstType;
-        typedef typename UnVolatile<T>::Result 
+        typedef typename UnVolatile<T>::Result
             NonVolatileType;
-        typedef typename UnVolatile<typename UnConst<T>::Result>::Result 
+        typedef typename UnVolatile<typename UnConst<T>::Result>::Result
             UnqualifiedType;
-        typedef typename PointerTraits<UnqualifiedType>::PointeeType 
+        typedef typename PointerTraits<UnqualifiedType>::PointeeType
             PointeeType;
-        typedef typename ReferenceTraits<T>::ReferredType 
+        typedef typename ReferenceTraits<T>::ReferredType
             ReferredType;
         typedef typename ReferenceTraits<typename UnVolatile<typename UnConst<T>::Result>::Result>::ReferredType
@@ -273 +267 @@
         enum { isPointer        = PointerTraits<
                                         typename ReferenceTraits<UnqualifiedType>::ReferredType >::result};
-                
+
     };
 }