diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-10 13:49:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-10 13:49:15 +0200 |
| commit | ab128e03ff555a8fc292352b0b21fc1075a4c008 (patch) | |
| tree | 41c610f0168cf67abd93d63df7f80e7e9df8d4ba /src/objdef.h | |
| parent | 9c497aa71f4678f7a8adcfedd37b73c5391d97ec (diff) | |
| download | minetest-ab128e03ff555a8fc292352b0b21fc1075a4c008.tar.gz minetest-ab128e03ff555a8fc292352b0b21fc1075a4c008.tar.bz2 minetest-ab128e03ff555a8fc292352b0b21fc1075a4c008.zip | |
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
Diffstat (limited to 'src/objdef.h')
| -rw-r--r-- | src/objdef.h | 4 |
1 files changed, 1 insertions, 3 deletions
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<ObjDef *> m_objects; ObjDefType m_objtype; - -private: - DISABLE_CLASS_COPY(ObjDefManager); }; #endif |