Pointed std namespace explicitly when using swap()

src/Layers/xrRender/SkeletonCustom.cpp

@@ -543,7 +543,7 @@ void CKinematics::Visibility_Update()
         {
             // move into invisible list
             children_invisible.push_back(children[c_it]);
-            swap(children[c_it], children.back());
+            std::swap(children[c_it], children.back());
             children.pop_back();
         }
     }
@@ -557,7 +557,7 @@ void CKinematics::Visibility_Update()
         {
             // move into visible list
             children.push_back(children_invisible[_it]);
-            swap(children_invisible[_it], children_invisible.back());
+            std::swap(children_invisible[_it], children_invisible.back());
             children_invisible.pop_back();
         }
     }

src/Layers/xrRenderPC_R2/r2_R_sun.cpp

@@ -487,7 +487,7 @@ class DumbConvexVolume
         _edge(int _p0, int _p1, int m) : p0(_p0), p1(_p1), counter(m)
         {
             if (p0 > p1)
-                swap(p0, p1);
+                std::swap(p0, p1);
         }
         bool equal(_edge& E) { return p0 == E.p0 && p1 == E.p1; }
     };

src/Layers/xrRenderPC_R3/r3_R_sun_support.h

@@ -297,7 +297,7 @@ class DumbConvexVolume
         _edge(int _p0, int _p1, int m) : p0(_p0), p1(_p1), counter(m)
         {
             if (p0 > p1)
-                swap(p0, p1);
+                std::swap(p0, p1);
         }
         bool equal(_edge& E) { return p0 == E.p0 && p1 == E.p1; }
     };

src/Layers/xrRenderPC_R4/r4_R_sun_support.h

@@ -297,7 +297,7 @@ class DumbConvexVolume
         _edge(int _p0, int _p1, int m) : p0(_p0), p1(_p1), counter(m)
         {
             if (p0 > p1)
-                swap(p0, p1);
+                std::swap(p0, p1);
         }
         bool equal(_edge& E) { return p0 == E.p0 && p1 == E.p1; }
     };

src/xrCore/_stl_extensions.h

@@ -23,8 +23,6 @@
 
 #pragma todo("tamlin: This header includes pretty much every std collection there are. Compiler-hog! FIX!")
 
-using std::swap;
-
 #include "xrCommon/predicates.h"
 
 // tamlin: TODO (low priority, for a rainy day): Rename these macros from DEFINE_* to DECLARE_*

src/xrGame/WeaponMagazinedWGrenade.cpp

@@ -173,8 +173,8 @@ void CWeaponMagazinedWGrenade::PerformSwitchGL()
 
     m_ammoTypes.swap(m_ammoTypes2);
 
-    swap(m_ammoType, m_ammoType2);
-    swap(m_DefaultCartridge, m_DefaultCartridge2);
+    std::swap(m_ammoType, m_ammoType2);
+    std::swap(m_DefaultCartridge, m_DefaultCartridge2);
 
     m_magazine.swap(m_magazine2);
     iAmmoElapsed = (int)m_magazine.size();

src/xrGame/ik/eqn.cxx

@@ -74,7 +74,7 @@ static int solve_trig1_aux(float c, float a2b2, float atan2ba, float theta[2])
 
         if (theta[0] > theta[1])
         {
-            swap(theta[0], theta[1]);
+            std::swap(theta[0], theta[1]);
             //	temp = theta[0];
             //    theta[0] = theta[1];
             //   theta[1] = temp;

src/xrGame/trade2.cpp

@@ -84,7 +84,7 @@ void CTrade::TransferItem(CInventoryItem* pItem, bool bBuying, bool bFree)
     CGameObject* O2 = smart_cast<CGameObject*>(pThis.inv_owner);
 
     if (!bBuying)
-        swap(O1, O2);
+        std::swap(O1, O2);
 
     NET_Packet P;
     O1->u_EventGen(P, GE_TRADE_SELL, O1->ID());