Changeset 1320 for code/branches/console/src/util/MultiTypeString.cc

Timestamp:

May 19, 2008, 2:18:55 AM (16 years ago)

Author:

landauf

Message:

changed the previously implemented assimilate function to take an optional default-value and to return false if the conversion failed.

File:

• code/branches/console/src/util/MultiTypeString.cc (modified) (1 diff)

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

@@ -136 +136 @@
 }
 
-void MultiTypeString::assimilate(const MultiTypeString& mts)
+bool MultiTypeString::assimilate(const MultiTypeString& mts, const MultiTypeString& defvalue)
 {
     if (this->type_ == MT_constchar)
-        this->string_ = mts.toString();
+        return ConvertValue(&this->string_, mts, defvalue.string_);
     else if (this->type_ == MT_string)
-        this->string_ = mts.toString();
+        return ConvertValue(&this->string_, mts, defvalue.string_);
     else
-        MultiTypePrimitive::assimilate(mts);
+        return MultiTypePrimitive::assimilate(mts, defvalue);
 }