Changeset 1780 for code/branches/core3

Timestamp:

Sep 14, 2008, 11:48:18 PM (16 years ago)

Author:

rgrieder

Message:

reverted some changes

Location:

code/branches/core3/src/util

Files:

• MultiType.h (modified) (3 diffs)
• MultiTypeValue.h (modified) (1 diff)

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

@@ -129 +129 @@
 
         virtual void toString(std::ostream& outstream) const = 0;
-        //virtual void toString(std::ostream& outstream) const = 0;
-        //inline friend virtual std::ostream& operator <<(std::ostream& outstream, const MT_ValueBase& mtb);
 
         MT_Type type_;
@@ -240 +238 @@
         template <class T> operator T*() const { return ((T*)this->operator void*()); }
 
-        inline friend std::ostream& operator<<(std::ostream& outstream, const MultiType& mt) { if (mt.value_) { mt.value_->toString(outstream); } return outstream; }
-
         inline void getValue(char*                 value) const { if (this->value_) { (*value) = (*this->value_); } }
         inline void getValue(unsigned char*        value) const { if (this->value_) { (*value) = (*this->value_); } }
@@ -322 +318 @@
 };
 
-//_UtilExport inline std::ostream& operator<<(std::ostream& outstream, const MultiType& mt) { if (mt.value_) { mt.value_->toString(outstream); } return outstream; }
+_UtilExport inline std::ostream& operator<<(std::ostream& outstream, const MultiType& mt) { if (mt.value_) { mt.value_->toString(outstream); } return outstream; }
 
 template <> inline bool MultiType::isType<char>()                 const { return (this->value_ && this->value_->type_ == MT_char);        }

code/branches/core3/src/util/MultiTypeValue.h

@@ -91 +91 @@
     inline operator orxonox::Degree()      const { return getConvertedValue<T, orxonox::Degree>     (this->value_); }
 
-    inline void toString(std::ostream& outstream) const { std::operator <<(outstream, conversion_cast<std::string>(this->value_)); }
-    //inline friend std::ostream& operator <<(std::ostream& outstream, const MT_Value& mtv) { outstream << conversion_cast<std::string>(this->value_); return outsream; }
+    inline void toString(std::ostream& outstream) const { outstream << this->value_; }
 
     T value_;