xrCore mk_pair replaced by std::make_pair

Author: Xottab-DUTY

src/Layers/xrRender/Blender_Recorder_R2.cpp

@@ -2,8 +2,8 @@
 #pragma hdrstop
 
 #include "ResourceManager.h"
-#include "blenders\Blender_Recorder.h"
-#include "blenders\Blender.h"
+#include "blenders/Blender_Recorder.h"
+#include "blenders/Blender.h"
 
 void fix_texture_name(LPSTR fn);
 
@@ -93,7 +93,7 @@ u32 CBlender_Compile::i_Sampler(LPCSTR _name)
 void CBlender_Compile::i_Texture(u32 s, LPCSTR name)
 {
     if (name)
-        passTextures.push_back(mk_pair(s, ref_texture(RImplementation.Resources->_CreateTexture(name))));
+        passTextures.push_back(std::make_pair(s, ref_texture(RImplementation.Resources->_CreateTexture(name))));
 }
 void CBlender_Compile::i_Projective(u32 s, bool b)
 {

src/Layers/xrRender/ColorMapManager.cpp

@@ -34,7 +34,7 @@ void ColorMapManager::UpdateTexture(const shared_str& strTexName, int iTex)
             ref_texture tmp;
             tmp.create(strTexName.c_str());
 
-            m_TexCache.insert(mk_pair(strTexName, tmp));
+            m_TexCache.insert(std::make_pair(strTexName, tmp));
 
             ID3DBaseTexture* e0 = tmp->surface_get();
             m_CMap[iTex]->surface_set(e0);

src/Layers/xrRender/ModelPool.cpp

@@ -256,7 +256,7 @@ dxRender_Visual* CModelPool::Create(const char* name, IReader* data)
         }
         // 3. If found - return (cloned) reference
         dxRender_Visual* Model = Instance_Duplicate(Base);
-        Registry.insert(mk_pair(Model, low_name));
+        Registry.insert(std::make_pair(Model, low_name));
         return Model;
     }
 }
@@ -303,7 +303,7 @@ void CModelPool::DeleteInternal(dxRender_Visual*& V, BOOL bDiscard)
         if (it != Registry.end())
         {
             // Registry entry found - move it to pool
-            Pool.insert(mk_pair(it->second, V));
+            Pool.insert(std::make_pair(it->second, V));
         }
         else
         {

src/Layers/xrRender/ResourceManager.cpp

@@ -98,7 +98,7 @@ void CResourceManager::ED_UpdateBlender(LPCSTR Name, IBlender* data)
     }
     else
     {
-        m_blenders.insert(mk_pair(xr_strdup(Name), data));
+        m_blenders.insert(std::make_pair(xr_strdup(Name), data));
     }
 }
 
@@ -441,7 +441,7 @@ void CResourceManager::_DumpMemoryUsage()
         {
             u32 m = I->second->flags.MemoryUsage;
             shared_str n = I->second->cName;
-            mtex.insert(mk_pair(m, mk_pair(I->second->dwReference, n)));
+            mtex.insert(std::make_pair(m, std::make_pair(I->second->dwReference, n)));
         }
     }
 

src/Layers/xrRender/ResourceManager.h

@@ -216,7 +216,7 @@ class ECORE_API CResourceManager
     void Delete(const Shader* S);
     void RegisterConstantSetup(LPCSTR name, R_constant_setup* s)
     {
-        v_constant_setup.push_back(mk_pair(shared_str(name), s));
+        v_constant_setup.push_back(std::make_pair(shared_str(name), s));
     }
 
     SGeometry* CreateGeom(D3DVERTEXELEMENT9* decl, ID3DVertexBuffer* vb, ID3DIndexBuffer* ib);

src/Layers/xrRender/ResourceManager_Loader.cpp

@@ -111,7 +111,7 @@ void CResourceManager::OnDeviceCreate(IReader* F)
                 chunk->seek(0);
                 B->Load(*chunk, desc.version);
 
-                std::pair<map_BlenderIt, bool> I = m_blenders.insert(mk_pair(xr_strdup(desc.cName), B));
+                std::pair<map_BlenderIt, bool> I = m_blenders.insert(std::make_pair(xr_strdup(desc.cName), B));
                 R_ASSERT2(I.second, "shader.xr - found duplicate name!!!");
             }
             chunk->close();

src/Layers/xrRender/ResourceManager_Resources.cpp

@@ -179,7 +179,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
     {
         SVS* _vs = new SVS();
         _vs->dwFlags |= xr_resource_flagged::RF_REGISTERED;
-        m_vs.insert(mk_pair(_vs->set_name(name), _vs));
+        m_vs.insert(std::make_pair(_vs->set_name(name), _vs));
         if (0 == stricmp(_name, "null"))
         {
             _vs->vs = NULL;
@@ -265,7 +265,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
     {
         SPS* _ps = new SPS();
         _ps->dwFlags |= xr_resource_flagged::RF_REGISTERED;
-        m_ps.insert(mk_pair(_ps->set_name(name), _ps));
+        m_ps.insert(std::make_pair(_ps->set_name(name), _ps));
         if (0 == stricmp(name, "null"))
         {
             _ps->ps = NULL;
@@ -381,7 +381,7 @@ CRT* CResourceManager::_CreateRT(LPCSTR Name, u32 w, u32 h, D3DFORMAT f, u32 Sam
     {
         CRT* RT = new CRT();
         RT->dwFlags |= xr_resource_flagged::RF_REGISTERED;
-        m_rtargets.insert(mk_pair(RT->set_name(Name), RT));
+        m_rtargets.insert(std::make_pair(RT->set_name(Name), RT));
         if (RDEVICE.b_is_Ready)
             RT->create(Name, w, h, f);
         return RT;
@@ -516,7 +516,7 @@ CTexture* CResourceManager::_CreateTexture(LPCSTR _Name)
     {
         CTexture* T = new CTexture();
         T->dwFlags |= xr_resource_flagged::RF_REGISTERED;
-        m_textures.insert(mk_pair(T->set_name(Name), T));
+        m_textures.insert(std::make_pair(T->set_name(Name), T));
         T->Preload();
         if (RDEVICE.b_is_Ready && !bDeferredLoad)
             T->Load();
@@ -570,7 +570,7 @@ CMatrix* CResourceManager::_CreateMatrix(LPCSTR Name)
         CMatrix* M = new CMatrix();
         M->dwFlags |= xr_resource_flagged::RF_REGISTERED;
         M->dwReference = 1;
-        m_matrices.insert(mk_pair(M->set_name(Name), M));
+        m_matrices.insert(std::make_pair(M->set_name(Name), M));
         return M;
     }
 }
@@ -608,7 +608,7 @@ CConstant* CResourceManager::_CreateConstant(LPCSTR Name)
         CConstant* C = new CConstant();
         C->dwFlags |= xr_resource_flagged::RF_REGISTERED;
         C->dwReference = 1;
-        m_constants.insert(mk_pair(C->set_name(Name), C));
+        m_constants.insert(std::make_pair(C->set_name(Name), C));
         return C;
     }
 }

src/Layers/xrRender/ShaderResourceTraits.h

@@ -93,7 +93,7 @@ inline T* CResourceManager::CreateShader(const char* name)
         T* sh = new T();
 
         sh->dwFlags |= xr_resource_flagged::RF_REGISTERED;
-        sh_map.insert(mk_pair(sh->set_name(name), sh));
+        sh_map.insert(std::make_pair(sh->set_name(name), sh));
         if (0 == stricmp(name, "null"))
         {
             sh->sh = NULL;

src/Layers/xrRender/SkeletonCustom.cpp

@@ -242,8 +242,8 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags)
         pBone->name = shared_str(buf);
         pBone->child_faces.resize(children.size());
         bones->push_back(pBone);
-        bone_map_N->push_back(mk_pair(pBone->name, ID));
-        bone_map_P->push_back(mk_pair(pBone->name, ID));
+        bone_map_N->push_back(std::make_pair(pBone->name, ID));
+        bone_map_P->push_back(std::make_pair(pBone->name, ID));
 
         // It's parent
         data->r_stringZ(buf, sizeof(buf));

src/Layers/xrRender/blenders/Blender_Recorder.cpp

@@ -319,7 +319,7 @@ void CBlender_Compile::Stage_Texture(LPCSTR name, u32, u32 fmin, u32 fmip, u32 f
             xrDebug::Fatal(DEBUG_INFO, "Not enought textures for shader. Base texture: '%s'.", *lst[0]);
         N = *lst[id];
     }
-    passTextures.push_back(mk_pair(Stage(), ref_texture(RImplementation.Resources->_CreateTexture(N))));
+    passTextures.push_back(std::make_pair(Stage(), ref_texture(RImplementation.Resources->_CreateTexture(N))));
     //	i_Address				(Stage(),address);
     i_Filter(Stage(), fmin, fmip, fmag);
 }