diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-07-15 04:09:55 +0200 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2017-07-17 21:40:43 +0200 |
| commit | 60dfaa09679219868e58a44d6d86f5d8d524ce24 (patch) | |
| tree | 66bbbc719322c331b68ab9f49b7a07ef7a870c1f /src/Globals.h | |
| parent | Simulators: Added area-based wakeup. (diff) | |
| download | cuberite-60dfaa09679219868e58a44d6d86f5d8d524ce24.tar cuberite-60dfaa09679219868e58a44d6d86f5d8d524ce24.tar.gz cuberite-60dfaa09679219868e58a44d6d86f5d8d524ce24.tar.bz2 cuberite-60dfaa09679219868e58a44d6d86f5d8d524ce24.tar.lz cuberite-60dfaa09679219868e58a44d6d86f5d8d524ce24.tar.xz cuberite-60dfaa09679219868e58a44d6d86f5d8d524ce24.tar.zst cuberite-60dfaa09679219868e58a44d6d86f5d8d524ce24.zip | |
Diffstat (limited to 'src/Globals.h')
| -rw-r--r-- | src/Globals.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Globals.h b/src/Globals.h index 777f8ca3d..dcac8dd94 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -175,10 +175,10 @@ template class SizeChecker<UInt16, 2>; template class SizeChecker<UInt8, 1>; // A macro to disallow the copy constructor and operator = functions -// This should be used in the private: declarations for any class that shouldn't allow copying itself +// This should be used in the declarations for any class that shouldn't allow copying itself #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName &); \ - void operator =(const TypeName &) + TypeName(const TypeName &) = delete; \ + TypeName & operator =(const TypeName &) = delete // A macro that is used to mark unused local variables, to avoid pedantic warnings in gcc / clang / MSVC // Note that in MSVC it requires the full type of X to be known @@ -227,7 +227,6 @@ template class SizeChecker<UInt8, 1>; #include <cstring> #include <pthread.h> #include <semaphore.h> - #include <errno.h> #include <fcntl.h> #include <unistd.h> #endif |