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

Timestamp:

Apr 14, 2008, 9:39:57 PM (16 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/Convert.h (modified) (2 diffs)

code/trunk/src/util/Convert.h

@@ -43 +43 @@
 #include "SubString.h"
 #include "MultiTypeMath.h"
+
+// disable annoying warning about forcing value to boolean
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(push)
+#pragma warning(disable:4100 4800)
+#endif
 
 
@@ -620 +626 @@
 };
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _Convert_H__ */