Changeset 1768 for code/branches/core3/src/util/MultiType.h

Timestamp:

Sep 11, 2008, 4:40:01 PM (16 years ago)

Author:

rgrieder

Message:

gcc test commit again

File:

• code/branches/core3/src/util/MultiType.h (modified) (3 diffs)

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_;
@@ -238 +240 @@
         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_); } }
@@ -318 +322 @@
 };
 
-_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);        }