How did this happen

Did not see some mk_pair and thus forgot to replace it
OpenXRay · Aug 4, 2017 · 4417a1b · 4417a1b
1 parent 9e3f801
commit 4417a1b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/Layers/xrRender/dxObjectSpaceRender.cpp b/src/Layers/xrRender/dxObjectSpaceRender.cpp
@@ -7,7 +7,7 @@
 dxObjectSpaceRender::dxObjectSpaceRender() { m_shDebug.create("debug\\wireframe", "$null"); }
 dxObjectSpaceRender::~dxObjectSpaceRender() { m_shDebug.destroy(); }
 void dxObjectSpaceRender::Copy(IObjectSpaceRender& _in) { *this = *(dxObjectSpaceRender*)&_in; }
-void dxObjectSpaceRender::dbgAddSphere(const Fsphere& sphere, u32 colour) { dbg_S.push_back(mk_pair(sphere, colour)); }
+void dxObjectSpaceRender::dbgAddSphere(const Fsphere& sphere, u32 colour) { dbg_S.push_back(std::make_pair(sphere, colour)); }
 void dxObjectSpaceRender::dbgRender()
 {
     R_ASSERT(bDebug);

diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget_enable_scissor.cpp b/src/Layers/xrRenderPC_R2/r2_rendertarget_enable_scissor.cpp
@@ -88,7 +88,7 @@ BOOL CRenderTarget::enable_scissor(light* L) // true if intersects near plane
     {
         Fsphere S;
         S.set(L->spatial.sphere.P, L->spatial.sphere.R);
-        dbg_spheres.push_back(mk_pair(S, L->color));
+        dbg_spheres.push_back(std::make_pair(S, L->color));
     }
 #endif
 

diff --git a/src/Layers/xrRenderPC_R3/r3_rendertarget_enable_scissor.cpp b/src/Layers/xrRenderPC_R3/r3_rendertarget_enable_scissor.cpp
@@ -92,7 +92,7 @@ BOOL CRenderTarget::enable_scissor(light* L) // true if intersects near plane
     {
         Fsphere S;
         S.set(L->spatial.sphere.P, L->spatial.sphere.R);
-        dbg_spheres.push_back(mk_pair(S, L->color));
+        dbg_spheres.push_back(std::make_pair(S, L->color));
     }
 #endif
 

diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget_enable_scissor.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget_enable_scissor.cpp
@@ -92,7 +92,7 @@ BOOL CRenderTarget::enable_scissor(light* L) // true if intersects near plane
     {
         Fsphere S;
         S.set(L->spatial.sphere.P, L->spatial.sphere.R);
-        dbg_spheres.push_back(mk_pair(S, L->color));
+        dbg_spheres.push_back(std::make_pair(S, L->color));
     }
 #endif
 

diff --git a/src/xrGame/ai/monsters/state_inline.h b/src/xrGame/ai/monsters/state_inline.h
@@ -132,7 +132,7 @@ CStateAbstract* CStateAbstract::get_state(u32 state_id)
 }
 
 TEMPLATE_SPECIALIZATION
-void CStateAbstract::add_state(u32 state_id, CSState* s) { substates.insert(mk_pair(state_id, s)); }
+void CStateAbstract::add_state(u32 state_id, CSState* s) { substates.insert(std::make_pair(state_id, s)); }
 TEMPLATE_SPECIALIZATION
 void CStateAbstract::free_mem()
 {

diff --git a/src/xrGame/level_debug.cpp b/src/xrGame/level_debug.cpp
@@ -88,7 +88,7 @@ CLevelDebug::CObjectInfo& CLevelDebug::object_info(IGameObject* obj, LPCSTR clas
         else
         {
             CObjectInfo* new_info = new CObjectInfo();
-            obj_it->second.insert(mk_pair(class_name, new_info));
+            obj_it->second.insert(std::make_pair(class_name, new_info));
             return (*(new_info));
         }
     }
@@ -97,8 +97,8 @@ CLevelDebug::CObjectInfo& CLevelDebug::object_info(IGameObject* obj, LPCSTR clas
         CLASS_INFO_MAP temp_map;
 
         CObjectInfo* new_info = new CObjectInfo();
-        temp_map.insert(mk_pair(class_name, new_info));
-        m_objects_info.insert(mk_pair(obj, temp_map));
+        temp_map.insert(std::make_pair(class_name, new_info));
+        m_objects_info.insert(std::make_pair(obj, temp_map));
 
         return (*(new_info));
     }
@@ -116,7 +116,7 @@ CLevelDebug::CTextInfo& CLevelDebug::text(void* class_ptr, LPCSTR class_name)
     else
     {
         CTextInfo* new_info = new CTextInfo();
-        m_text_info.insert(mk_pair(key, new_info));
+        m_text_info.insert(std::make_pair(key, new_info));
         return (*(new_info));
     }
 }
@@ -133,7 +133,7 @@ CLevelDebug::CLevelInfo& CLevelDebug::level_info(void* class_ptr, LPCSTR class_n
     else
     {
         CLevelInfo* new_info = new CLevelInfo();
-        m_level_info.insert(mk_pair(key, new_info));
+        m_level_info.insert(std::make_pair(key, new_info));
         return (*(new_info));
     }
 }