Changeset 7401 in orxonox.OLD for trunk/src/lib/util/multi_type.h

Timestamp:

Apr 27, 2006, 4:49:31 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: small fixes

File:

• trunk/src/lib/util/multi_type.h (modified) (1 diff)

trunk/src/lib/util/multi_type.h

@@ -92 +92 @@
     void debug() const;
 
-    static const char* MultiTypeToString(MT_Type type);
+    static const std::string& MultiTypeToString(MT_Type type);
     static MT_Type StringToMultiType(const std::string& type);
 
   private:
+    //! A union, that combines types into as little memory as possible.
     union MultiTypeValue
     {
-      bool              Bool;
-      int               Int;
-      float             Float;
-      char              Char;
-//      std::string*      String;
-    }                   value;
-    std::string         storedString;
-    MT_Type             type;
+      bool                       Bool;              //!< If it is a BOOL
+      int                        Int;               //!< If it is an INT
+      float                      Float;             //!< If it is a FLOAT
+      char                       Char;              //!< If it is a CHAR
+    }                            value;             //!< The Value.
+    std::string                  storedString;      //!< The Stored String.
+    MT_Type                      type;              //!< The Type stored in this MultiType
+
+    static const std::string     typeNames[];       //!< List of TypeNames for conversion.
 };