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/objdef.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/objdef.h') diff --git a/src/objdef.h b/src/objdef.h index 77189e454..1b96fa52a 100644 --- a/src/objdef.h +++ b/src/objdef.h @@ -59,6 +59,7 @@ class ObjDefManager { public: ObjDefManager(IGameDef *gamedef, ObjDefType type); virtual ~ObjDefManager(); + DISABLE_CLASS_COPY(ObjDefManager); virtual const char *getObjectTitle() const { return "ObjDef"; } @@ -91,9 +92,6 @@ protected: INodeDefManager *m_ndef; std::vector m_objects; ObjDefType m_objtype; - -private: - DISABLE_CLASS_COPY(ObjDefManager); }; #endif -- cgit v1.2.3