From ab128e03ff555a8fc292352b0b21fc1075a4c008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Sat, 10 Jun 2017 13:49:15 +0200 Subject: C++11 patchset 6: forbid object copy using assigment/copy function deleters (#5945) C++11 implement function deleting, it's generally used to prevent some object copy In script API use this function removal on ScriptApiBase instead of ScriptApiClient/Server/MainMenu, this affect all ScriptApis Move DISABLE_CLASS_COPY with constructor, the deleted function permit to replace function in its original place --- src/environment.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/environment.h') diff --git a/src/environment.h b/src/environment.h index 4c00ef9e8..55fc4707c 100644 --- a/src/environment.h +++ b/src/environment.h @@ -49,6 +49,7 @@ public: // Environment will delete the map passed to the constructor Environment(IGameDef *gamedef); virtual ~Environment(); + DISABLE_CLASS_COPY(Environment); /* Step everything in environment. @@ -121,8 +122,6 @@ protected: private: std::mutex m_time_lock; - - DISABLE_CLASS_COPY(Environment); }; #endif -- cgit v1.2.3