Merge remote-tracking branch 't6/patch-freebsd'

apps/essimporter/converter.hpp

@@ -121,7 +121,7 @@ public:
         {
             mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;
             mContext->mPlayerBase = npc;
-            std::map<const int, float> empty;
+            std::map<int, float> empty;
             // FIXME: player start spells and birthsign spells aren't listed here,
             // need to fix openmw to account for this
             for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)

apps/essimporter/convertinventory.cpp

@@ -1,6 +1,7 @@
 #include "convertinventory.hpp"
 
 #include <components/misc/stringops.hpp>
+#include <cstdlib>
 
 namespace ESSImport
 {

apps/openmw/crashcatcher.cpp

@@ -24,7 +24,7 @@
 #ifndef PR_SET_PTRACER
 #define PR_SET_PTRACER 0x59616d61
 #endif
-#elif defined (__APPLE__)
+#elif defined (__APPLE__) || defined (__FreeBSD__)
 #include <signal.h>
 #endif
 

apps/openmw/mwmechanics/spells.cpp

@@ -44,7 +44,7 @@ namespace MWMechanics
     {
         if (mSpells.find (spell)==mSpells.end())
         {
-            std::map<const int, float> random;
+            std::map<int, float> random;
 
             // Determine the random magnitudes (unless this is a castable spell, in which case
             // they will be determined when the spell is cast)

apps/openmw/mwmechanics/spells.hpp

@@ -33,7 +33,7 @@ namespace MWMechanics
 
             typedef const ESM::Spell* SpellKey;
 
-            typedef std::map<SpellKey, std::map<const int, float> > TContainer; // ID, <effect index, normalised random magnitude>
+            typedef std::map<SpellKey, std::map<int, float> > TContainer; // ID, <effect index, normalised random magnitude>
             typedef TContainer::const_iterator TIterator;
 
             struct CorprusStats

apps/openmw/mwworld/projectilemanager.hpp

@@ -3,6 +3,7 @@
 
 #include <string>
 
+#include <osg/observer_ptr>
 #include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>
 

apps/openmw/mwworld/refdata.hpp

@@ -5,6 +5,7 @@
 
 #include "../mwscript/locals.hpp"
 
+#include <string>
 #include <osg/Vec3f>
 
 namespace SceneUtil

apps/openmw/mwworld/worldimp.cpp

@@ -108,7 +108,11 @@ namespace MWWorld
         }
 
         private:
+#ifdef HAVE_UNORDERED_MAP
+          typedef std::unordered_map<std::string, ContentLoader*> LoadersContainer;
+#else
           typedef std::tr1::unordered_map<std::string, ContentLoader*> LoadersContainer;
+#endif
           LoadersContainer mLoaders;
     };
 

components/esm/spellstate.cpp

@@ -12,7 +12,7 @@ namespace ESM
         {
             std::string id = esm.getHString();
 
-            std::map<const int, float> random;
+            std::map<int, float> random;
             while (esm.isNextSub("INDX"))
             {
                 int index;
@@ -73,8 +73,8 @@ namespace ESM
         {
             esm.writeHNString("SPEL", it->first);
 
-            const std::map<const int, float>& random = it->second;
-            for (std::map<const int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
+            const std::map<int, float>& random = it->second;
+            for (std::map<int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
             {
                 esm.writeHNT("INDX", rIt->first);
                 esm.writeHNT("RAND", rIt->second);

components/esm/spellstate.hpp

@@ -28,7 +28,7 @@ namespace ESM
             float mMagnitude;
         };
 
-        typedef std::map<std::string, std::map<const int, float> > TContainer;
+        typedef std::map<std::string, std::map<int, float> > TContainer;
         TContainer mSpells;
 
         std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;

components/resource/bulletshape.cpp

@@ -1,6 +1,7 @@
 #include "bulletshape.hpp"
 
 #include <stdexcept>
+#include <string>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>

components/sceneutil/lightcontroller.cpp

@@ -2,6 +2,7 @@
 
 #include <cmath>
 
+#include <osg/observer_ptr>
 #include <osg/NodeVisitor>
 
 #include <components/sceneutil/lightmanager.hpp>

components/sceneutil/lightutil.cpp

@@ -1,5 +1,6 @@
 #include "lightutil.hpp"
 
+#include <osg/observer_ptr>
 #include <osg/Light>
 #include <osg/Group>
 #include <osg/ComputeBoundsVisitor>