[Orxonox-commit 56] r2761 - in trunk/src: . core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-08 17:08:57 +0100 (Sun, 08 Mar 2009)
New Revision: 2761

Modified:
   trunk/src/OrxonoxConfig.h.in
   trunk/src/core/Factory.cc
   trunk/src/core/Factory.h
Log:
Removed forgotten std::cout output in Factory (from objecthierarchy branch originally)
Removed CP_SLASH, it was a dead end anyway.

Modified: trunk/src/OrxonoxConfig.h.in
===================================================================
--- trunk/src/OrxonoxConfig.h.in	2009-03-08 15:52:52 UTC (rev 2760)
+++ trunk/src/OrxonoxConfig.h.in	2009-03-08 16:08:57 UTC (rev 2761)
@@ -175,19 +175,4 @@
 #  include <vld.h>
 #endif
 
-
-/*---------------------------------
- * Various Settings
- *-------------------------------*/
-/* Define a platform independent directory separator */
-namespace orxonox
-{
-#ifdef ORXONOX_PLATFORM_WINDOWS
-    const char CP_SLASH('\\');
-#else
-    const char CP_SLASH('/');
-#endif
-}
-
-
 #endif /* _OrxonoxConfig_H__ */

Modified: trunk/src/core/Factory.cc
===================================================================
--- trunk/src/core/Factory.cc	2009-03-08 15:52:52 UTC (rev 2760)
+++ trunk/src/core/Factory.cc	2009-03-08 16:08:57 UTC (rev 2761)
@@ -75,7 +75,6 @@
     {
         getFactoryPointer()->identifierStringMap_[name] = identifier;
         getFactoryPointer()->identifierNetworkIDMap_[identifier->getNetworkID()] = identifier;
-//std::cout << identifier->getName() << ": " << identifier->getNetworkID() << std::endl;
     }
 
     /**
@@ -88,7 +87,6 @@
     {
 //        getFactoryPointer()->identifierNetworkIDMap_.erase(oldID);
         getFactoryPointer()->identifierNetworkIDMap_[newID] = identifier;
-//std::cout << identifier->getName() << ": " << oldID << " -> " << newID << std::endl;
     }
 
     /**

Modified: trunk/src/core/Factory.h
===================================================================
--- trunk/src/core/Factory.h	2009-03-08 15:52:52 UTC (rev 2760)
+++ trunk/src/core/Factory.h	2009-03-08 16:08:57 UTC (rev 2761)
@@ -62,7 +62,7 @@
             static Identifier* getIdentifier(const uint32_t id);
             static void add(const std::string& name, Identifier* identifier);
             static void changeNetworkID(Identifier* identifier, const uint32_t oldID, const uint32_t newID);
-	    static void cleanNetworkIDs();
+            static void cleanNetworkIDs();
             static void createClassHierarchy();
 
             static Factory* getFactoryPointer();    // avoid overriding order problem in the static intialisation process