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/emerge.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/emerge.h')
| -rw-r--r-- | src/emerge.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/emerge.h b/src/emerge.h index 2b5d57434..cf014a9e8 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -119,6 +119,7 @@ public: // Methods EmergeManager(Server *server); ~EmergeManager(); + DISABLE_CLASS_COPY(EmergeManager); bool initMapgens(MapgenParams *mgparams); @@ -144,7 +145,6 @@ public: Mapgen *getCurrentMapgen(); // Mapgen helpers methods - Biome *getBiomeAtPoint(v3s16 p); int getSpawnLevelAtPoint(v2s16 p); int getGroundLevelAtPoint(v2s16 p); bool isBlockUnderground(v3s16 blockpos); @@ -178,8 +178,6 @@ private: bool popBlockEmergeData(v3s16 pos, BlockEmergeData *bedata); friend class EmergeThread; - - DISABLE_CLASS_COPY(EmergeManager); }; #endif |