Changeset 5769

Timestamp:

Sep 23, 2009, 8:53:33 PM (15 years ago)

Author:

landauf

Message:

moved BaseFactory from Factory.h to ClassFactory.h

Location:

code/branches/core5/src/libraries/core

Files:

• ClassFactory.h (modified) (1 diff)
• Factory.h (modified) (1 diff)
• Identifier.cc (modified) (1 diff)

code/branches/core5/src/libraries/core/ClassFactory.h

@@ -47 +47 @@
 namespace orxonox
 {
+    // ###############################
+    // ###       BaseFactory       ###
+    // ###############################
+    //! Base-class of ClassFactory.
+    class _CoreExport BaseFactory
+    {
+        public:
+            virtual BaseObject* fabricate(BaseObject* creator) = 0;
+            virtual ~BaseFactory() {};
+    };
+
     // ###############################
     // ###      ClassFactory       ###

code/branches/core5/src/libraries/core/Factory.h

@@ -86 +86 @@
             std::map<uint32_t, Identifier*> identifierNetworkIDMap_;        //!< The map, mapping the network ID with the Identifier
     };
-
-    // ###############################
-    // ###       BaseFactory       ###
-    // ###############################
-    //! Base-class of ClassFactory. Has to be defined separate because of circular dependencies.
-    class _CoreExport BaseFactory
-    {
-        public:
-            virtual BaseObject* fabricate(BaseObject* creator) = 0;
-            virtual ~BaseFactory() {};
-    };
 }
 

code/branches/core5/src/libraries/core/Identifier.cc

@@ -39 +39 @@
 #include "ConfigValueContainer.h"
 #include "ConsoleCommand.h"
-#include "Factory.h"
+#include "ClassFactory.h"
 #include "XMLPort.h"