Changeset 931 for code/branches/core2/src/util

Timestamp:

Mar 27, 2008, 3:56:13 AM (17 years ago)

Author:

landauf

Message:

expanded Executor

Location:

code/branches/core2/src/util

Files:

• Convert.h (modified) (1 diff)
• MultiTypeString.cc (modified) (1 diff)
• String.cc (modified) (1 diff)

code/branches/core2/src/util/Convert.h

@@ -541 +541 @@
 };
 
-
-////////////////
-// XMLElement //
-////////////////
-
-// orxonox::Element to std::string
-template <>
-class Converter<orxonox::Element, std::string>
-{
-  public:
-    bool operator()(std::string* output, const orxonox::Element& input) const
-    {
-      std::ostringstream ostream;
-      if (ostream << input)
-      {
-        (*output) = ostream.str();
-        return true;
-      }
-
-      return false;
-    }
-};
-
-// std::string to orxonox::Element
-template <>
-class Converter<std::string, orxonox::Element>
-{
-  public:
-    bool operator()(orxonox::Element* output, const std::string& input) const
-    {
-      std::istringstream istream(input);
-      if (istream >> (*output))
-        return true;
-
-      return false;
-    }
-};
-
-
 #endif /* _Convert_H__ */

code/branches/core2/src/util/MultiTypeString.cc

@@ -32 +32 @@
 MultiTypeString::MultiTypeString(MultiType type) : MultiTypePrimitive(type)
 {
-    if (type == MT_constchar)
-        this->string_ = std::string("");
-    else if (type == MT_string)
-        this->string_ = std::string("");
+    // Nothing to do for string and xml-element
 }
 

code/branches/core2/src/util/String.cc

@@ -83 +83 @@
 bool isEmpty(const std::string& str)
 {
-    return getStripped(str) == "";
+    std::string temp = getStripped(str);
+    return ((temp == "") || (temp.size() == 0));
 }