Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1727 for code/branches/core3


Ignore:
Timestamp:
Sep 7, 2008, 3:11:43 AM (16 years ago)
Author:
landauf
Message:

small change to satisfy gcc4

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core3/src/util/MultiTypeValue.h

    r1726 r1727  
    4141    inline MT_ValueBase* clone() const { return new MT_Value<T>(this->value_, this->type_); }
    4242    inline void reset() { this->value_ = T(); }
    43     inline void assimilate(const MultiType& other) { if (other.value_) { this->value_ = other.operator T(); } else { this->value_ = T(); } }
     43    inline void assimilate(const MultiType& other) { if (other.value_) { T temp; other.getValue(&temp); this->value_ = temp; } else { this->value_ = T(); } }
    4444
    4545    inline void setValue(const char& value)                 { this->value_ = getConvertedValue<char,                 T>(value); }
Note: See TracChangeset for help on using the changeset viewer.