Changeset 10172

Timestamp:

07/26/10 12:34:52 (3 years ago)

Author:

Snyder.Jason

Message:

the trueValues initialization, transform, and contains call were not working so I did everything manually. This makes sense to my Java brain, but there may be (and probably is) a more elegant c++-style solution.

Files:

• ossiedev/trunk/system/ossie/parser/prop_helpers.cpp (modified) (1 diff)

ossiedev/trunk/system/ossie/parser/prop_helpers.cpp

@@ -30 +30 @@
 #include <ossie/prop_helpers.h>
 
-static const std::vector<std::string> trueValues = {"true", "t", "on", "yes", "1"};
+static std::vector<std::string> trueValues;
 
 CORBA::Boolean ossieSupport::strings_to_boolean(std::vector<std::string> &values)
 {
+    trueValues.push_back("true");
+    trueValues.push_back("t");
+    trueValues.push_back("on");
+    trueValues.push_back("yes");
+    trueValues.push_back("1");
+
     std::string localValue = values[0];
 
-    std::transform(localValue.begin(), localValue.end(), localValue.begin(), std::tolower);
-
-    return CORBA::Boolean(trueValues.contains(localValue));
+    for(int i = 0; localValue[i] != '\0'; i++)
+        localValue[i] = tolower(localValue[i]);
+
+    for(int i = 0; i < 5; i++)
+    {
+        if(trueValues[i] == localValue)
+                return CORBA::Boolean(true);
+    }
+
+    return CORBA::Boolean(false);
 }