Changeset 7720 in orxonox.OLD

Timestamp:

May 19, 2006, 3:29:21 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: strings work too now

Location:

trunk/src

Files:

• lib/util/executor/executor_functional.h (modified) (2 diffs)
• orxonox.cc (modified) (2 diffs)

trunk/src/lib/util/executor/executor_functional.h

@@ -39 +39 @@
 template<> float fromString<float>(const std::string& input, float defaultValue) { return isFloat(input, defaultValue); };
 template<> char fromString<char>(const std::string& input, char defaultValue) { return isInt(input, defaultValue); };
-template<> const std::string& fromString<const std::string&>(const std::string& input, const std::string& defaultValue) { return isString(input, defaultValue); };
+template<> const std::string& fromString<const std::string&>(const std::string& input, const std::string& defaultValue) { static std::string retVal = isString(input, defaultValue); return retVal; };
 
 template<typename type> type getDefault(const MultiType* const defaultValues, unsigned int i) { return (type)0; };
@@ -47 +47 @@
 template<> float getDefault<float>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getFloat(); };
 template<> char getDefault<char>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getChar(); };
-template<> std::string getDefault<std::string>(const MultiType* const defaultValues, unsigned int i) { return defaultValues[i].getString(); };
+template<> const std::string& getDefault<const std::string&>(const MultiType* const defaultValues, unsigned int i) { static std::string retVal = defaultValues[i].getString(); return retVal; };
 
 #endif /* __EXECUTOR_FUNCTIONAL_H_ */

trunk/src/orxonox.cc

@@ -431 +431 @@
   void printTestBool(bool b) { printf("%d\n", (int)b); };
   void printTwoVals(int b, int i) { printf ("%d %d\n", b, i); };
-
+  void printStrings(const std::string& name) { printf("String:: '%s'\n", name.c_str()); };
   static void printStatic() { printf("STATIC\n");};
 };
@@ -444 +444 @@
   (*createExecutor<TestClass>(&TestClass::printTwoVals))(&test, testStrings);
   (*createExecutor<TestClass>(&TestClass::printStatic))(&test, testStrings);
+  (*createExecutor<TestClass>(&TestClass::printStrings))(&test, testStrings);
 
 }