From 2092e5fe228ca917685a36fe35668d94b1be6437 Mon Sep 17 00:00:00 2001 From: gus Date: Tue, 22 Jul 2014 11:49:45 +0200 Subject: [PATCH] compile fixes --- apps/opencs/model/doc/document.cpp | 1 + apps/openmw/mwmechanics/levelledlist.hpp | 2 ++ apps/openmw/mwrender/animation.cpp | 2 ++ apps/openmw/mwrender/occlusionquery.cpp | 2 ++ apps/openmw/mwrender/renderingmanager.cpp | 1 + apps/openmw/mwstate/statemanagerimp.cpp | 2 ++ apps/openmw/mwworld/containerstore.cpp | 1 + components/bsa/bsa_archive.cpp | 2 +- components/nif/niffile.hpp | 1 + extern/sdl4ogre/sdlinputwrapper.cpp | 1 + extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp | 2 ++ libs/openengine/bullet/physic.hpp | 1 + 12 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp index 23a47b3130..6dc361c1eb 100644 --- a/apps/opencs/model/doc/document.cpp +++ b/apps/opencs/model/doc/document.cpp @@ -1,6 +1,7 @@ #include "document.hpp" #include +#include #include diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp index 5d9e291181..ad0677067b 100644 --- a/apps/openmw/mwmechanics/levelledlist.hpp +++ b/apps/openmw/mwmechanics/levelledlist.hpp @@ -8,6 +8,8 @@ #include "../mwbase/environment.hpp" #include "../mwmechanics/creaturestats.hpp" +#include + namespace MWMechanics { diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index 872740d74b..f1fcce5f7a 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -1,5 +1,7 @@ #include "animation.hpp" +#include + #include #include #include diff --git a/apps/openmw/mwrender/occlusionquery.cpp b/apps/openmw/mwrender/occlusionquery.cpp index 92a49acc01..c228a01603 100644 --- a/apps/openmw/mwrender/occlusionquery.cpp +++ b/apps/openmw/mwrender/occlusionquery.cpp @@ -1,5 +1,7 @@ #include "occlusionquery.hpp" +#include + #include #include #include diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 23edb3a7fb..157265c964 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -1,6 +1,7 @@ #include "renderingmanager.hpp" #include +#include #include #include diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp index a3604cc66e..cf4f05a4c6 100644 --- a/apps/openmw/mwstate/statemanagerimp.cpp +++ b/apps/openmw/mwstate/statemanagerimp.cpp @@ -1,6 +1,8 @@ #include "statemanagerimp.hpp" +#include + #include #include #include diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp index e330ddaeed..7c7470bd12 100644 --- a/apps/openmw/mwworld/containerstore.cpp +++ b/apps/openmw/mwworld/containerstore.cpp @@ -1,6 +1,7 @@ #include "containerstore.hpp" +#include #include #include #include diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp index 6574f096b5..4cd754f2b1 100644 --- a/components/bsa/bsa_archive.cpp +++ b/components/bsa/bsa_archive.cpp @@ -45,7 +45,7 @@ static char strict_normalize_char(char ch) static char nonstrict_normalize_char(char ch) { - return ch == '\\' ? '/' : std::tolower(ch); + return ch == '\\' ? '/' : std::tolower(ch,std::locale()); } template diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp index d701242635..87e46b2347 100644 --- a/components/nif/niffile.hpp +++ b/components/nif/niffile.hpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include diff --git a/extern/sdl4ogre/sdlinputwrapper.cpp b/extern/sdl4ogre/sdlinputwrapper.cpp index f65dfb376f..0f2008e99a 100644 --- a/extern/sdl4ogre/sdlinputwrapper.cpp +++ b/extern/sdl4ogre/sdlinputwrapper.cpp @@ -4,6 +4,7 @@ #include #include +#include namespace SFO { diff --git a/extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp b/extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp index e718540197..8b819f6ef8 100644 --- a/extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp +++ b/extern/shiny/Platforms/Ogre/OgreGpuProgram.cpp @@ -8,6 +8,8 @@ #include #include +#include + namespace sh { OgreGpuProgram::OgreGpuProgram( diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp index e37caee386..a806c2f3b3 100644 --- a/libs/openengine/bullet/physic.hpp +++ b/libs/openengine/bullet/physic.hpp @@ -8,6 +8,7 @@ #include #include "BulletShapeLoader.h" #include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h" +#include