Changeset 7268 for code/trunk/src/libraries/util

Timestamp:

Aug 30, 2010, 7:34:07 PM (14 years ago)

Author:

rgrieder

Message:

operator=() should not return constant references.

Location:

code/trunk/src/libraries/util

Files:

• MultiType.h (modified) (1 diff)
• mbool.h (modified) (1 diff)

code/trunk/src/libraries/util/MultiType.h

@@ -272 +272 @@
             inline ~MultiType() { if (this->value_) { delete this->value_; } }
 
-            template <typename V> inline const MultiType& operator=(const V& value)         { this->setValue(value); return (*this); } /** @brief Assigns a new value. The value will be converted to the current type of the MultiType. */
-            template <typename V> inline const MultiType& operator=(V* value)               { this->setValue(value); return (*this); } /** @brief Assigns a pointer. */
-            inline                       const MultiType& operator=(const MultiType& other) { this->setValue(other); return (*this); } /** @brief Assigns the value of the other MultiType and converts it to the current type of the MultiType. */
-            inline                       const MultiType& operator=(MT_Type::Value type)    { this->setType(type);   return (*this); } /** @brief Resets the value and changes the type. */
+            template <typename V> inline MultiType& operator=(const V& value)         { this->setValue(value); return (*this); } /** @brief Assigns a new value. The value will be converted to the current type of the MultiType. */
+            template <typename V> inline MultiType& operator=(V* value)               { this->setValue(value); return (*this); } /** @brief Assigns a pointer. */
+            inline                       MultiType& operator=(const MultiType& other) { this->setValue(other); return (*this); } /** @brief Assigns the value of the other MultiType and converts it to the current type of the MultiType. */
+            inline                       MultiType& operator=(MT_Type::Value type)    { this->setType(type);   return (*this); } /** @brief Resets the value and changes the type. */
 
             inline bool                                   setValue(const char& value);

code/trunk/src/libraries/util/mbool.h

@@ -42 +42 @@
                 { this->value_.memory_ = value.value_.memory_; }
 
-            inline const mbool& operator=(bool value)
+            inline mbool& operator=(bool value)
                 { if (value != this->value_.bool_) { ++this->value_.memory_; } return (*this); }
-            inline const mbool& operator=(const mbool& value)
+            inline mbool& operator=(const mbool& value)
                 { this->value_.memory_ = value.value_.memory_; return (*this); }