Changeset 6040 for sandbox_light/src/libraries/util

Timestamp:

Nov 5, 2009, 10:15:05 PM (15 years ago)

Author:

rgrieder

Message:

Also synchronised sandbox_light with current trunk.

Location:

sandbox_light

Files:

• . (modified) (1 prop)
• src/libraries/util/CMakeLists.txt (modified) (1 diff)
• src/libraries/util/Clock.cc (copied) (copied from sandbox/src/libraries/util/Clock.cc) (1 diff)
• src/libraries/util/Clock.h (copied) (copied from sandbox/src/libraries/util/Clock.h)
• src/libraries/util/UtilPrereqs.h (modified) (5 diffs)

sandbox_light/src/libraries/util/CMakeLists.txt

@@ -19 +19 @@
 
 SET_SOURCE_FILES(UTIL_SRC_FILES
+  Clock.cc
   Exception.cc
   Math.cc

sandbox_light/src/libraries/util/Clock.cc

@@ -28 +28 @@
 
 #include "Clock.h"
-#include <OgreTimer.h>
+#include <ogremath/OgreTimer.h>
 
 namespace orxonox

sandbox_light/src/libraries/util/UtilPrereqs.h

@@ -28 +28 @@
 
 /**
-  @file
-  @brief Contains all the necessary forward declarations for all classes and structs.
+@file
+@brief
+    Shared library macros, enums, constants and forward declarations for the util library
 */
 
@@ -40 +41 @@
 // Shared library settings
 //-----------------------------------------------------------------------
+
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( UTIL_STATIC_BUILD )
 #  ifdef UTIL_SHARED_BUILD
@@ -56 +58 @@
 #endif
 
+//-----------------------------------------------------------------------
+// Enums
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+    namespace ScopeID
+    {
+        //!A list of available scopes for the Scope template.
+        enum Value
+        {
+            Root,
+            Graphics
+        };
+    }
+}
 
 //-----------------------------------------------------------------------
@@ -63 +81 @@
 namespace orxonox
 {
+    class Clock;
     class Exception;
     class ExprParser;
@@ -71 +90 @@
     class OutputBufferListener;
     class OutputHandler;
+    template <ScopeID::Value>
+    class Scope;
+    template <class, ScopeID::Value>
+    class ScopedSingleton;
+    class ScopeListener;
     class SignalHandler;
+    template <class T>
+    class Singleton;
     class SubString;
 }