diff --git a/extern/oics/ICSPrerequisites.h b/extern/oics/ICSPrerequisites.h index 5fe58a63d..6e6cd814b 100644 --- a/extern/oics/ICSPrerequisites.h +++ b/extern/oics/ICSPrerequisites.h @@ -36,10 +36,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include - -#if defined(_WIN32) && _MSC_VER >= 1800 -#include /* std::min and std::max */ -#endif +#include /* std::min and std::max for MSVC 2013 */ #include "tinyxml.h" @@ -94,7 +91,7 @@ namespace ICS // from http://www.cplusplus.com/forum/articles/9645/ template - T FromString ( const std::string &Text )//Text not by const reference so that the function can be used with a + T FromString ( const std::string &Text )//Text not by const reference so that the function can be used with a { //character array as argument std::stringstream ss(Text); T result; diff --git a/extern/sdl4ogre/sdlinputwrapper.hpp b/extern/sdl4ogre/sdlinputwrapper.hpp index e4c97066d..275701814 100644 --- a/extern/sdl4ogre/sdlinputwrapper.hpp +++ b/extern/sdl4ogre/sdlinputwrapper.hpp @@ -1,10 +1,7 @@ #ifndef SDL4OGRE_SDLINPUTWRAPPER_H #define SDL4OGRE_SDLINPUTWRAPPER_H -#if defined(_WIN32) && _MSC_VER >= 1800 -#include #define NOMINMAX -#endif #include