mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 09:32:45 +00:00
Code Issues Projects Releases Wiki Activity

Remove #ifdef guards.

Browse Source
This commit is contained in:
cc9cii 2014-06-06 19:58:05 +10:00
parent 76bf774485
commit fd758bacd3
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extern/oics/ICSPrerequisites.h vendored
View File

@ -36,10 +36,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <map> #include <map>
#include <list> #include <list>
#include <limits> #include <limits>
#include <algorithm> /* std::min and std::max for MSVC 2013 */
#if defined(_WIN32) && _MSC_VER >= 1800
#include <algorithm> /* std::min and std::max */
#endif
#include "tinyxml.h" #include "tinyxml.h"
@ -94,7 +91,7 @@ namespace ICS
// from http://www.cplusplus.com/forum/articles/9645/ // from http://www.cplusplus.com/forum/articles/9645/
template <typename T> template <typename T>
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 { //character array as argument
std::stringstream ss(Text); std::stringstream ss(Text);
T result; T result;

3
extern/sdl4ogre/sdlinputwrapper.hpp vendored
View File

@ -1,10 +1,7 @@
#ifndef SDL4OGRE_SDLINPUTWRAPPER_H #ifndef SDL4OGRE_SDLINPUTWRAPPER_H
#define SDL4OGRE_SDLINPUTWRAPPER_H #define SDL4OGRE_SDLINPUTWRAPPER_H
#if defined(_WIN32) && _MSC_VER >= 1800
#include <algorithm>
#define NOMINMAX #define NOMINMAX
#endif
#include <SDL_events.h> #include <SDL_events.h>