Use Noncopyable instead of type-specific stuff.

Also some minor formatting cleaning.

Author: tamlin-mike

src/Layers/xrRenderDX10/3DFluid/dx103DFluidManager.cpp

@@ -591,7 +591,7 @@ void dx103DFluidManager::ApplyVorticityConfinement(float timestep)
     // );
 }
 
-void dx103DFluidManager::ApplyExternalForces(const dx103DFluidData& FluidData, float timestep)
+void dx103DFluidManager::ApplyExternalForces(const dx103DFluidData& FluidData, float /*timestep*/)
 {
     PIX_EVENT(ApplyExternalForces);
 
@@ -621,7 +621,7 @@ void dx103DFluidManager::ComputeVelocityDivergence(float timestep)
     // pRenderTargetShaderViews[RENDER_TARGET_TEMPVECTOR] );
 }
 
-void dx103DFluidManager::ComputePressure(float timestep)
+void dx103DFluidManager::ComputePressure(float /*timestep*/)
 {
     PIX_EVENT(ComputePressure);
 
@@ -693,7 +693,7 @@ void dx103DFluidManager::ComputePressure(float timestep)
     // TechniqueJacobi->GetPassByIndex(0)->Apply(0);
 }
 
-void dx103DFluidManager::ProjectVelocity(float timestep)
+void dx103DFluidManager::ProjectVelocity(float /*timestep*/)
 {
     PIX_EVENT(ProjectVelocity);
 

src/xrCore/LocatorAPI.h

@@ -9,6 +9,7 @@
 //#include "xrCore/Threading/Lock.hpp"
 #include "xrCommon/xr_map.h"
 #include "xrCommon/predicates.h"
+#include "Common/Noncopyable.hpp"
 
 class CStreamReader;
 class Lock;
@@ -37,7 +38,7 @@ class FileStatus
     operator bool() const { return Exists; }
 };
 
-class XRCORE_API CLocatorAPI
+class XRCORE_API CLocatorAPI : Noncopyable
 {
     friend class FS_Path;
 
@@ -209,10 +210,6 @@ class XRCORE_API CLocatorAPI
     void rescan_pathes();
     void lock_rescan();
     void unlock_rescan();
-
-private:
-	CLocatorAPI(const CLocatorAPI&) = delete;
-	void operator=(const CLocatorAPI&) = delete;
 };
 
 extern XRCORE_API CLocatorAPI* xr_FS;

src/xrCore/xrMemory_POOL.h

@@ -3,11 +3,12 @@
 #define xrMemory_POOLh
 #include "_types.h"
 #include "xrCommon/inlining_macros.h"
+#include "Common/Noncopyable.hpp"
 
 class xrMemory;
 class Lock;
 
-class MEMPOOL
+class MEMPOOL : Noncopyable
 {
 #ifdef DEBUG_MEMORY_MANAGER
     friend class xrMemory;
@@ -25,10 +26,6 @@ class MEMPOOL
     void destroy(void*& P);
 
 private:
-    // noncopyable
-    MEMPOOL(const MEMPOOL&) = delete;
-    void operator=(const MEMPOOL&) = delete;
-
     ICF void** access(void* P) { return (void**)((void*)(P)); }
     void block_create();
 

src/xrCore/xrsharedmem.h

@@ -4,6 +4,7 @@
 
 //#include "_stl_extensions.h"
 #include "xrCommon/xr_vector.h"
+#include "Common/Noncopyable.hpp"
 
 // fwd. decl.
 class Lock;
@@ -56,7 +57,7 @@ IC bool smem_equal(const smem_value* A, u32 dwCRC, u32 dwLength, u8* ptr)
 #pragma warning(pop)
 
 //////////////////////////////////////////////////////////////////////////
-class XRCORE_API smem_container
+class XRCORE_API smem_container : Noncopyable
 {
 
 public:
@@ -69,9 +70,6 @@ class XRCORE_API smem_container
     u32 stat_economy();
 
 private:
-    smem_container(const smem_container&) = delete;
-    void operator=(const smem_container&) = delete;
-
     typedef xr_vector<smem_value*> cdb;
     Lock* pcs;
     cdb container;

src/xrGame/ai/stalker/ai_stalker_script_entity.cpp

@@ -36,13 +36,13 @@ u32 CAI_Stalker::GetWeaponAmmo() const
 CInventoryItem* CAI_Stalker::GetMedikit() const
 {
 #pragma todo("Dima to Dima : Return correct medikit")
-    return (0);
+    return 0;
 }
 
 CInventoryItem* CAI_Stalker::GetFood() const
 {
 #pragma todo("Dima to Dima : Return correct food")
-    return (0);
+    return 0;
 }
 
 void CAI_Stalker::ResetScriptData(void* P) { inherited::ResetScriptData(P); }

src/xrNetServer/NET_Client.h

@@ -4,6 +4,7 @@
 #include "NET_Common.h"
 #include "xrCommon/xr_deque.h"
 #include "xrCommon/xr_vector.h"
+#include "Common/Noncopyable.hpp"
 
 struct ip_address;
 
@@ -47,7 +48,7 @@ class XRNETSERVER_API IPureClient : private MultipacketReciever, private Multipa
     friend void sync_thread(void*);
 
 protected:
-    struct HOST_NODE // deprecated...
+    struct HOST_NODE : Noncopyable // deprecated...
     {
         HOST_NODE();
         HOST_NODE(const HOST_NODE& rhs);
@@ -57,9 +58,6 @@ class XRNETSERVER_API IPureClient : private MultipacketReciever, private Multipa
         DPN_APPLICATION_DESC* pdpAppDesc;
         IDirectPlay8Address* pHostAddress;
         shared_str dpSessionName;
-
-    private:
-        void operator=(const HOST_NODE&) = delete;
     };
 
     GameDescriptionData m_game_description;