Changeset 3280 for code/trunk/src/util/Convert.h

Timestamp:

Jul 12, 2009, 11:58:01 PM (15 years ago)

Author:

rgrieder

Message:

Merged most of the core4 revisions back to the trunk except for:

• orxonox_cast
• all the radical changes in the input library

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/util/Convert.h (modified) (2 diffs)

code/trunk/src/util/Convert.h

@@ -43 +43 @@
 
 #include "Debug.h"
-#include "String.h"
+#include "StringUtils.h"
 #include "TemplateUtils.h"
 
@@ -316 +316 @@
     }
 
-    // convert to string Shortcut
-    template <class FromType>
-    FORCEINLINE std::string convertToString(FromType value)
-    {
-        return getConvertedValue<FromType, std::string>(value);
-    }
-
-    // convert from string Shortcut
-    template <class ToType>
-    FORCEINLINE ToType convertFromString(std::string str)
-    {
-        return getConvertedValue<std::string, ToType>(str);
-    }
-
     ////////////////////////////////
     // Special string conversions //