Changeset 9356 for code/branches/testing

Timestamp:

Sep 1, 2012, 11:32:20 AM (12 years ago)

Author:

landauf

Message:

details

Location:

code/branches/testing

Files:

• src/libraries/util/MultiType.h (modified) (1 diff)
• test/util/ConvertTest.cc (modified) (1 diff)

code/branches/testing/src/libraries/util/MultiType.h

@@ -330 +330 @@
             /// Converts the current value to type T.
             template <typename T> inline bool convert() { return this->force<T>(MultiType(*this)); }
-//            template <typename T> inline bool convert() { return this->force<T>(this->get<typename Loki::TypeTraits<T>::UnqualifiedReferredType>()); }
 
             /// Resets value and type. Type will be void afterwards and null() returns true.

code/branches/testing/test/util/ConvertTest.cc

@@ -91 +91 @@
         EXPECT_EQ('\n', multi_cast<char>(std::string("\n")));
         EXPECT_EQ('\0', multi_cast<char>(std::string("")));
+        EXPECT_EQ('1', multi_cast<char>(std::string("123")));
 
         // bool
         EXPECT_TRUE(multi_cast<bool>(std::string("true")));
         EXPECT_FALSE(multi_cast<bool>(std::string("false")));
+        EXPECT_FALSE(multi_cast<bool>(std::string("0")));
+        EXPECT_FALSE(multi_cast<bool>(std::string("0.123")));
+        EXPECT_TRUE(multi_cast<bool>(std::string("1")));
+        EXPECT_TRUE(multi_cast<bool>(std::string("123.456")));
 
         // TODO: Check consistency of conversion depending on MathConvert.h and reversibility