Code conformance improvement

Author: Xottab-DUTY

Externals/ode/include/ode/misc.h

@@ -55,7 +55,7 @@ dReal dRandReal();
 
 /* print out a matrix */
 #ifdef __cplusplus
-void dPrintMatrix (const dReal *A, int n, int m, char *fmt = "%10.4f ",
+void dPrintMatrix (const dReal *A, int n, int m, const char *fmt = "%10.4f ",
 		   FILE *f=stdout);
 #else
 void dPrintMatrix (const dReal *A, int n, int m, char *fmt, FILE *f);

Externals/ode/ode/src/misc.cpp

@@ -76,7 +76,7 @@ dReal dRandReal()
 //****************************************************************************
 // matrix utility stuff
 
-void dPrintMatrix (const dReal *A, int n, int m, char *fmt, FILE *f)
+void dPrintMatrix (const dReal *A, int n, int m, const char *fmt, FILE *f)
 {
   int i,j;
   int skip = dPAD(m);

src/Common/object_comparer.h

@@ -43,8 +43,8 @@ struct CComparer
         if (v1.size() != v2.size())
             return p();
 
-        svector<T, size>::const_iterator I = v1.begin(), J = v2.begin();
-        svector<T, size>::const_iterator E = v1.end();
+        auto I = v1.cbegin(), J = v2.cbegin();
+        auto E = v1.end();
         for (; I != E; ++I, ++J)
             if (!compare(*I, *J, p))
                 return false;

src/Common/object_loader.h

@@ -42,7 +42,7 @@ struct CLoader
         template <>
         static void load_data<true>(T& data, M& stream, const P& p)
         {
-            CLoader<M, P>::load_data(*(data = new object_type_traits::remove_pointer<T>::type()), stream, p);
+            CLoader<M, P>::load_data(*(data = new typename object_type_traits::remove_pointer<T>::type()), stream, p);
         }
     };
 
@@ -101,7 +101,7 @@ struct CLoader
             const u32 count = stream.r_u32();
             for (u32 i = 0; i < count; ++i)
             {
-                T::value_type temp;
+                typename T::value_type temp;
                 CLoader<M, P>::load_data(temp, stream, p);
                 if (p(data, temp))
                     add(data, temp);
@@ -144,11 +144,11 @@ struct CLoader
     template <typename T1, typename T2>
     static void load_data(std::pair<T1, T2>& data, M& stream, const P& p)
     {
-        if (p(data, const_cast<object_type_traits::remove_const<T1>::type&>(data.first), true))
+        if (p(data, const_cast<typename object_type_traits::remove_const<T1>::type&>(data.first), true))
         {
             const bool value = object_type_traits::is_same<T1, LPCSTR>::value;
             VERIFY(!value);
-            load_data(const_cast<object_type_traits::remove_const<T1>::type&>(data.first), stream, p);
+            load_data(const_cast<typename object_type_traits::remove_const<T1>::type&>(data.first), stream, p);
         }
         if (p(data, data.second, false))
             load_data(data.second, stream, p);
@@ -183,7 +183,7 @@ struct CLoader
         const u32 count = stream.r_u32();
         for (u32 i = 0; i < count; ++i)
         {
-            svector<T, size>::value_type temp;
+            typename svector<T, size>::value_type temp;
             CLoader<M, P>::load_data(temp, stream, p);
             if (p(data, temp))
                 data.push_back(temp);
@@ -202,7 +202,7 @@ struct CLoader
         const u32 count = stream.r_u32();
         for (u32 i = 0; i < count; ++i)
         {
-            std::queue<T1, T2>::value_type t;
+            typename std::queue<T1, T2>::value_type t;
             CLoader<M, P>::load_data(t, stream, p);
             if (p(temp, t))
                 temp.push(t);
@@ -223,7 +223,7 @@ struct CLoader
         const u32 count = stream.r_u32();
         for (u32 i = 0; i < count; ++i)
         {
-            T1<T2, T3>::value_type t;
+            typename  T1<T2, T3>::value_type t;
             CLoader<M, P>::load_data(t, stream, p);
             if (p(temp, t))
                 temp.push(t);
@@ -244,7 +244,7 @@ struct CLoader
         u32 count = stream.r_u32();
         for (u32 i = 0; i < count; ++i)
         {
-            T1<T2, T3, T4>::value_type t;
+            typename T1<T2, T3, T4>::value_type t;
             CLoader<M, P>::load_data(t, stream, p);
             if (p(temp, t))
                 temp.push(t);

src/Common/object_saver.h

@@ -92,8 +92,8 @@ struct CSaver
     IC static void save_data(const xr_vector<bool>& data, M& stream, const P& /*p*/)
     {
         stream.w_u32((u32)data.size());
-        xr_vector<bool>::const_iterator I = data.begin();
-        xr_vector<bool>::const_iterator E = data.end();
+        auto I = data.cbegin();
+        auto E = data.cend();
         u32 mask = 0;
         if (I != E)
         {
@@ -116,8 +116,8 @@ struct CSaver
     IC static void save_data(const svector<T, size>& data, M& stream, const P& p)
     {
         stream.w_u32((u32)data.size());
-        svector<T, size>::const_iterator I = data.begin();
-        svector<T, size>::const_iterator E = data.end();
+        auto I = data.cbegin();
+        auto E = data.cend();
         for (; I != E; ++I)
             if (p(data, *I))
                 CSaver<M, P>::save_data(*I, stream, p);

src/Layers/xrRender/ColorMapManager.h

@@ -16,7 +16,7 @@ class ColorMapManager
 private:
     void UpdateTexture(const shared_str& strTexName, int iTex);
 
-    struct str_pred : public std::binary_function<const shared_str&, const shared_str&, bool>
+    struct str_pred
     {
         bool operator()(const shared_str& x, const shared_str& y) const { return x < y; }
     };

src/Layers/xrRender/ModelPool.h

@@ -16,7 +16,7 @@ class ECORE_API CModelPool
 {
     friend class CRender;
 
-    struct str_pred : public std::binary_function<const shared_str&, const shared_str&, bool>
+    struct str_pred
     {
         bool operator()(const shared_str& x, const shared_str& y) const { return xr_strcmp(x, y) < 0; }
     };

src/Layers/xrRender/ParticleGroup.cpp

@@ -346,7 +346,7 @@ void OnGroupParticleDead(void* owner, u32 param, PAPI::Particle& m, u32 idx)
         PG->items[param].StartFreeChild(PE, *eff->m_OnDeadChildName, m);
 }
 //------------------------------------------------------------------------------
-struct zero_vis_pred : public std::unary_function<dxRender_Visual*, bool>
+struct zero_vis_pred
 {
     bool operator()(const dxRender_Visual* x) { return x == nullptr; }
 };

src/Layers/xrRender/ResourceManager.cpp

@@ -34,9 +34,9 @@ void fix_texture_name(LPSTR fn)
 template <class T>
 bool reclaim(xr_vector<T*>& vec, const T* ptr)
 {
-    xr_vector<T*>::iterator it = vec.begin();
-    xr_vector<T*>::iterator end = vec.end();
-    for (; it != end; it++)
+    auto it = vec.begin();
+    auto end = vec.end();
+    for (; it != end; ++it)
         if (*it == ptr)
         {
             vec.erase(it);

src/Layers/xrRender/ResourceManager.h

@@ -19,7 +19,7 @@ class dx10ConstantBuffer;
 class ECORE_API CResourceManager
 {
 private:
-    struct str_pred : public std::binary_function<char*, char*, bool>
+    struct str_pred
     {
         bool operator()(LPCSTR x, LPCSTR y) const { return xr_strcmp(x, y) < 0; }
     };