disabling gcc extensions

CMakeLists.txt

@@ -306,7 +306,7 @@ endif()
 
 # Compiler settings
 if (CMAKE_COMPILER_IS_GNUCC)
-    add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder)
+    add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++0x -pedantic)
 
     # Silence warnings in OGRE headers. Remove once OGRE got fixed!
     add_definitions (-Wno-ignored-qualifiers)

apps/launcher/pluginsview.hpp

@@ -24,6 +24,6 @@ public slots:
 
 };
 
-Q_DECLARE_METATYPE(QVector<QPersistentModelIndex>);
+Q_DECLARE_METATYPE(QVector<QPersistentModelIndex>)
 
-#endif
+#endif

apps/mwiniimporter/importer.cpp

@@ -78,7 +78,7 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(std::string filename) {
 
         multistrmap::iterator it;
         if((it = map.find(key)) == map.end()) {
-            map.insert( std::make_pair<std::string, std::vector<std::string> > (key, std::vector<std::string>() ) );
+            map.insert( std::make_pair (key, std::vector<std::string>() ) );
         }
         map[key].push_back(value);
     }
@@ -115,7 +115,7 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(std::string filename) {
 
         multistrmap::iterator it;
         if((it = map.find(key)) == map.end()) {
-            map.insert( std::make_pair<std::string, std::vector<std::string> > (key, std::vector<std::string>() ) );
+            map.insert( std::make_pair (key, std::vector<std::string>() ) );
         }
         map[key].push_back(value);
     }
@@ -152,12 +152,12 @@ void MwIniImporter::mergeFallback(multistrmap &cfg, multistrmap &ini) {
             }
         }
     }
-};
+}
 
 void MwIniImporter::insertMultistrmap(multistrmap &cfg, std::string key, std::string value) {
     multistrmap::iterator it = cfg.find(key);
     if(it == cfg.end()) {
-        cfg.insert(std::make_pair<std::string, std::vector<std::string> >(key, std::vector<std::string>() ));
+        cfg.insert(std::make_pair (key, std::vector<std::string>() ));
     }
     cfg[key].push_back(value);
 }

apps/openmw/main.cpp

@@ -68,7 +68,7 @@ void validate(boost::any &v, std::vector<std::string> const &tokens, FallbackMap
 
         if((mapIt = map->mMap.find(key)) == map->mMap.end())
         {
-            map->mMap.insert(std::make_pair<std::string,std::string>(key,value));
+            map->mMap.insert(std::make_pair (key,value));
         }
     }
 }

apps/openmw/mwbase/soundmanager.hpp

@@ -37,7 +37,7 @@ namespace MWBase
                 Play_Normal  = 0, /* tracked, non-looping, multi-instance, environment */
                 Play_Loop    = 1<<0, /* Sound will continually loop until explicitly stopped */
                 Play_NoEnv   = 1<<1, /* Do not apply environment effects (eg, underwater filters) */
-                Play_NoTrack = 1<<2, /* (3D only) Play the sound at the given object's position
+                Play_NoTrack = 1<<2  /* (3D only) Play the sound at the given object's position
                                       * but do not keep it updated (the sound will not move with
                                       * the object and will not stop when the object is deleted. */
             };

apps/openmw/mwmechanics/drawstate.hpp

@@ -8,7 +8,7 @@ namespace MWMechanics
     {
         DrawState_Weapon = 0,
         DrawState_Spell = 1,
-        DrawState_Nothing = 2,
+        DrawState_Nothing = 2
     };
 }
 

apps/openmw/mwrender/globalmap.cpp

@@ -53,7 +53,7 @@ namespace MWRender
         {
             Ogre::Image image;
 
-            Ogre::uchar data[mWidth * mHeight * 3];
+            std::vector<Ogre::uchar> data (mWidth * mHeight * 3);
 
             for (int x = mMinX; x <= mMaxX; ++x)
             {
@@ -150,7 +150,7 @@ namespace MWRender
                 }
             }
 
-            image.loadDynamicImage (data, mWidth, mHeight, Ogre::PF_B8G8R8);
+            image.loadDynamicImage (&data[0], mWidth, mHeight, Ogre::PF_B8G8R8);
 
             //image.save (mCacheDir + "/GlobalMap.png");
 

apps/openmw/mwrender/water.hpp

@@ -23,7 +23,7 @@ namespace Ogre
     class Entity;
     class Vector3;
     struct RenderTargetEvent;
-};
+}
 
 namespace MWRender {
 

apps/openmw/mwscript/scriptmanagerimp.hpp

@@ -74,6 +74,6 @@ namespace MWScript
             ///< Return index of the variable of the given name and type in the given script. Will
             /// throw an exception, if there is no such script or variable or the type does not match.
     };
-};
+}
 
 #endif

apps/openmw/mwsound/mpgsnd_decoder.hpp

@@ -52,6 +52,6 @@ namespace MWSound
 #ifndef DEFAULT_DECODER
 #define DEFAULT_DECODER (::MWSound::MpgSnd_Decoder)
 #endif
-};
+}
 
 #endif

apps/openmw/mwsound/openal_output.hpp

@@ -66,6 +66,6 @@ namespace MWSound
 #ifndef DEFAULT_OUTPUT
 #define DEFAULT_OUTPUT (::MWSound::OpenAL_Output)
 #endif
-};
+}
 
 #endif

apps/openmw/mwsound/soundmanagerimp.hpp

@@ -26,7 +26,7 @@ namespace MWSound
 
     enum Environment {
         Env_Normal,
-        Env_Underwater,
+        Env_Underwater
     };
 
     class SoundManager : public MWBase::SoundManager

components/esm/aipackage.hpp

@@ -60,7 +60,7 @@ namespace ESM
         AI_Travel = 0x545f4941,
         AI_Follow = 0x465f4941,
         AI_Escort = 0x455f4941,
-        AI_Activate = 0x415f4941,
+        AI_Activate = 0x415f4941
     };
 
     /// \note Used for storaging packages in a single container

components/esm_store/reclists.hpp

@@ -331,7 +331,7 @@ namespace ESMS
     // Find land for the given coordinates. Return null if no mData.
     Land *search(int x, int y) const
     {
-      LandMap::const_iterator itr = lands.find(std::make_pair<int, int>(x, y));
+      LandMap::const_iterator itr = lands.find(std::make_pair (x, y));
       if ( itr == lands.end() )
       {
         return NULL;
@@ -350,7 +350,7 @@ namespace ESMS
       land->load(esm);
 
       // Store the structure
-      lands[std::make_pair<int, int>(land->mX, land->mY)] = land;
+      lands[std::make_pair (land->mX, land->mY)] = land;
     }
   };
 

libs/openengine/bullet/CMotionState.cpp

@@ -16,7 +16,7 @@ namespace Physic
         pEng = eng;
         tr.setIdentity();
         pName = name;
-    };
+    }
 
     void CMotionState::getWorldTransform(btTransform &worldTrans) const
     {

libs/openengine/bullet/physic.cpp

@@ -626,4 +626,4 @@ namespace Physic
 
         shape->Shape->getAabb(trans, min, max);
     }
-}};
+}}