Changeset 1064 for code/trunk/src/util

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

Location:

code/trunk/src/util

Files:

• Convert.h (modified) (2 diffs)
• MultiTypeMath.h (modified) (2 diffs)
• MultiTypeString.cc (modified) (1 diff)
• MultiTypeString.h (modified) (2 diffs)
• String.cc (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__ */

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__ */

code/trunk/src/util/MultiTypeString.cc

@@ -120 +120 @@
         return MultiTypePrimitive::toString();
 
-    return output;
+    // FIXME: unreachable code
+    // return output;
 }
 

code/trunk/src/util/MultiTypeString.h

@@ -37 +37 @@
 
 #include "MultiTypePrimitive.h"
+
+// disable annoying warning about multiple assignment operators
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(push)
+#pragma warning(disable:4522)
+#endif
 
 class _UtilExport MultiTypeString : public MultiTypePrimitive
@@ -117 +123 @@
 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _MultiTypeString_H__ */

code/trunk/src/util/String.cc

@@ -308 +308 @@
     for (unsigned int i = 0; i < str->size(); ++i)
     {
-        (*str)[i] = tolower((*str)[i]);
+        (*str)[i] = (char)tolower((*str)[i]);
     }
 }
@@ -332 +332 @@
     for (unsigned int i = 0; i < str->size(); ++i)
     {
-        (*str)[i] = toupper((*str)[i]);
+        (*str)[i] = (char)toupper((*str)[i]);
     }
 }