Changeset 3196 for code/trunk/src/core/ConfigValueContainer.cc

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/ConfigValueContainer.cc (modified) (2 diffs)

code/trunk/src/core/ConfigValueContainer.cc

@@ -34 +34 @@
 #include "ConfigValueContainer.h"
 
-#include <fstream>
-
+#include "util/Convert.h"
 #include "util/SubString.h"
-#include "util/Convert.h"
 #include "Language.h"
-#include "Identifier.h"
-
-
 
 namespace orxonox
@@ -303 +298 @@
 
         if (token.size() > 0)
-            success = ConvertValue(&index, token[0]);
+            success = convertValue(&index, token[0]);
 
         if (!success || index < 0 || index > (signed int)MAX_VECTOR_INDEX)