Index: code/trunk/src/util/Convert.h
===================================================================
--- code/trunk/src/util/Convert.h	(revision 1062)
+++ code/trunk/src/util/Convert.h	(revision 1064)
@@ -43,4 +43,10 @@
 #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,3 +626,7 @@
 };
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _Convert_H__ */
Index: code/trunk/src/util/MultiTypeMath.h
===================================================================
--- code/trunk/src/util/MultiTypeMath.h	(revision 1062)
+++ code/trunk/src/util/MultiTypeMath.h	(revision 1064)
@@ -35,4 +35,10 @@
 #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,3 +166,7 @@
 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _MultiTypeMath_H__ */
Index: code/trunk/src/util/MultiTypeString.cc
===================================================================
--- code/trunk/src/util/MultiTypeString.cc	(revision 1062)
+++ code/trunk/src/util/MultiTypeString.cc	(revision 1064)
@@ -120,5 +120,6 @@
         return MultiTypePrimitive::toString();
 
-    return output;
+    // FIXME: unreachable code
+    // return output;
 }
 
Index: code/trunk/src/util/MultiTypeString.h
===================================================================
--- code/trunk/src/util/MultiTypeString.h	(revision 1062)
+++ code/trunk/src/util/MultiTypeString.h	(revision 1064)
@@ -37,4 +37,10 @@
 
 #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,3 +123,7 @@
 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _MultiTypeString_H__ */
Index: code/trunk/src/util/String.cc
===================================================================
--- code/trunk/src/util/String.cc	(revision 1062)
+++ code/trunk/src/util/String.cc	(revision 1064)
@@ -308,5 +308,5 @@
     for (unsigned int i = 0; i < str->size(); ++i)
     {
-        (*str)[i] = tolower((*str)[i]);
+        (*str)[i] = (char)tolower((*str)[i]);
     }
 }
@@ -332,5 +332,5 @@
     for (unsigned int i = 0; i < str->size(); ++i)
     {
-        (*str)[i] = toupper((*str)[i]);
+        (*str)[i] = (char)toupper((*str)[i]);
     }
 }
Index: code/trunk/src/util/String2Number.h
===================================================================
--- code/trunk/src/util/String2Number.h	(revision 1062)
+++ 	(revision )
@@ -1,81 +1,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Nicolas Perrenoud <nicolape_at_ee.ethz.ch>
- *   Co-authors:
- *      ...
- *
- */
-
-#ifndef _String2Number_H__
-#define _String2Number_H__
-
-#include "UtilPrereqs.h"
-
-#include <string>
-#include <sstream>
-#include <iostream>
-
-#include "core/Debug.h"
-
-/**
- * String to number conversion
- *
- * This class converts a number inside a std::string
- * into a numeric type number (int,float,double)
- * Number in string can be decimal, hexadecimal or octal
- *
- * @author Nicolas Perrenoud<nicolape_at_ee.ethz.ch>
- *
- * @example
- * float f;
- * String2Number<float>(f, std::string(" 123.45 "));
- */
-
-template <class T>
-class String2Number
-{
-  private:
-  bool success_;
-
-  public:
-  /**
-   * Constructor
-   *
-   * First value is the target variable, the second vector is the
-   * string where the number is taken from, the third parameter
-   * should be one of std::hex, std::dec or std::oct (dec is default value)
-   */
-  inline String2Number(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) =  std::dec, int haltOnError=1)
-  {
-    std::istringstream iss(s);
-    success_ = !(iss >> f >> t).fail();
-
-    if (!success_ && haltOnError==1)
-    {
-      COUT(1) << "Error: Conversion from string to number in \"" << s << "\" failed." << std::endl;
-      exit(1);
-    }
-  }
-};
-
-#endif /* _String2Number_H__ */
Index: code/trunk/src/util/Tokenizer.h
===================================================================
--- code/trunk/src/util/Tokenizer.h	(revision 1062)
+++ 	(revision )
@@ -1,68 +1,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Nicolas Perrenoud <nicolape_at_ee.ethz.ch>
- *   Co-authors:
- *      ...
- *
- */
-
-#ifndef _Tokenizer_H__
-#define _Tokenizer_H__
-
-#include <string>
-#include <iostream>
-#include <vector>
-
-/**
- * String tokenizer
- *
- * Splits a given string into several smaller strings
- * using a delmiter (default is the comma).
- * Returns the result as a vector<string> object
- *
- * @author Nicolas Perrenoud<nicolape_at_ee.ethz.ch>
- */
-
-inline std::vector<std::string> tokenize(const std::string& str, const std::string& delimiters = ",")
-{
-  std::vector<std::string> tokens;
-
-  // Skip delimiters at beginning.
-  std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
-  // Find first "non-delimiter".
-  std::string::size_type pos     = str.find_first_of(delimiters, lastPos);
-
-  while (std::string::npos != pos || std::string::npos != lastPos)
-  {
-      // Found a token, add it to the vector.
-      tokens.push_back(str.substr(lastPos, pos - lastPos));
-      // Skip delimiters.  Note the "not_of"
-      lastPos = str.find_first_not_of(delimiters, pos);
-      // Find next "non-delimiter"
-      pos = str.find_first_of(delimiters, lastPos);
-  }
-  return tokens;
-}
-
-
-#endif /* _Tokenizer_H__ */
