Changeset 2371 for code/branches/presentation/src/core/Factory.h

Timestamp:

Dec 10, 2008, 12:50:05 PM (16 years ago)

Author:

scheusso

Message:

merged network branch to presentation branch

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/core/Factory.h (modified) (3 diffs)

code/branches/presentation/src/core/Factory.h

@@ -49 +49 @@
 #include <map>
 #include <string>
+#include "util/Integers.h"
 
 namespace orxonox
@@ -60 +61 @@
         public:
             static Identifier* getIdentifier(const std::string& name);
-            static Identifier* getIdentifier(const unsigned int id);
+            static Identifier* getIdentifier(const uint32_t id);
             static void add(const std::string& name, Identifier* identifier);
-            static void changeNetworkID(Identifier* identifier, const unsigned int oldID, const unsigned int newID);
+            static void changeNetworkID(Identifier* identifier, const uint32_t oldID, const uint32_t newID);
             static void createClassHierarchy();
 
@@ -83 +84 @@
 
             std::map<std::string, Identifier*> identifierStringMap_;            //!< The map, mapping the name with the Identifier
-            std::map<unsigned int, Identifier*> identifierNetworkIDMap_;        //!< The map, mapping the network ID with the Identifier
+            std::map<uint32_t, Identifier*> identifierNetworkIDMap_;        //!< The map, mapping the network ID with the Identifier
     };