Changeset 10407 for code/branches/core7/src/libraries/util

Timestamp:

Apr 27, 2015, 11:08:26 PM (10 years ago)

Author:

landauf

Message:

moved Scope and ScopedSingletonManager from util to core.
TODO I had to disable two tests in ScopeTest.cc because now that it runs in the core library, there are too many singletons which get loaded in graphics scope (with too many dependencies). this should be fixed

Location:

code/branches/core7/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• UtilPrereqs.h (modified) (2 diffs)

code/branches/core7/src/libraries/util/CMakeLists.txt

@@ -26 +26 @@
   CRC32.cc
   ExprParser.cc
-  Scope.cc
-  ScopedSingletonManager.cc
   SharedPtr.cc
   Sleep.cc

code/branches/core7/src/libraries/util/UtilPrereqs.h

@@ -62 +62 @@
 
 //-----------------------------------------------------------------------
-// Enums
-//-----------------------------------------------------------------------
-
-namespace orxonox
-{
-    namespace ScopeID
-    {
-        //!A list of available scopes for the Scope template.
-        enum Value
-        {
-            Root,
-            Graphics
-        };
-    }
-}
-
-//-----------------------------------------------------------------------
 // Forward declarations
 //-----------------------------------------------------------------------
@@ -96 +79 @@
     class OutputManager;
     class OutputStream;
-    template <ScopeID::Value>
-    class Scope;
-    template <class, ScopeID::Value>
-    class ScopedSingleton;
     class ScopeListener;
     template <class T>