Changeset 2492 for code/branches/presentation/src/util

Timestamp:

Dec 17, 2008, 12:55:03 AM (16 years ago)

Author:

rgrieder

Message:

Merged overlay branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/MultiType.cc (modified) (1 diff)
• src/util/MultiType.h (modified) (1 diff)
• src/util/SignalHandler.cc (modified) (1 prop)
• src/util/SignalHandler.h (modified) (1 prop)

code/branches/presentation/src/util/MultiType.cc

@@ -45 +45 @@
         switch (type)
         {
+            case MT_null:
+                this->reset(); return true;
             case MT_char:
                 return this->convert<char>(); break;

code/branches/presentation/src/util/MultiType.h

@@ -305 +305 @@
 
             /** @brief Current content gets deleted. New type is MT_null */
-            inline void                       reset()                         { if (this->value_) this->value_->reset(); }
-
-            template <typename T> inline void setType()                       { this->assignValue(T());                            } /** @brief Resets the value and changes the internal type to T. */
-            inline void                       setType(const MultiType& other) { this->setType(other.getType());                    } /** @brief Resets the value and changes the internal type to the type of the other MultiType. */
-            inline void                       setType(MT_Type type)           { this->reset(); this->convert(type); this->reset(); } /** @brief Resets the value and changes the internal type to the given type. */
+            inline void                       reset()                         { if (this->value_) delete this->value_; this->value_ = 0; }
+            /** @brief Current content gets overridden with default zero value */
+            inline void                       resetValue()                    { if (this->value_) this->value_->reset(); }
+
+            template <typename T> inline void setType()                       { this->assignValue(T());                                 } /** @brief Resets the value and changes the internal type to T. */
+            inline void                       setType(const MultiType& other) { this->setType(other.getType());                         } /** @brief Resets the value and changes the internal type to the type of the other MultiType. */
+            inline void                       setType(MT_Type type)           { this->reset(); this->convert(type); this->resetValue(); } /** @brief Resets the value and changes the internal type to the given type. */
 
             /** @brief Returns the current type. */