Changeset 1064 for code/trunk/src/util/MultiTypeMath.h

Timestamp:

Apr 14, 2008, 9:39:57 PM (17 years ago)

Author:

rgrieder

Message:

• replaced all String2Number with ConvertValue
• replaced all tokenize with SubString
• dealt with warnings under msvc
• removed some warnings by placing casts
• bugfix in audio: local variable pushed into member variable std::vector
• updated StableHeaders.h

File:

• code/trunk/src/util/MultiTypeMath.h (modified) (2 diffs)

code/trunk/src/util/MultiTypeMath.h

@@ -35 +35 @@
 #include "MultiTypeString.h"
 #include "Math.h"
+
+// disable annoying warning about multiple assignment operators
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(push)
+#pragma warning(disable:4522)
+#endif
 
 class _UtilExport MultiTypeMath : public MultiTypeString
@@ -160 +166 @@
 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _MultiTypeMath_H__ */