summaryrefslogtreecommitdiffstats
path: root/src/Globals.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-02-02 16:25:30 +0100
committerMattes D <github@xoft.cz>2014-02-02 16:25:30 +0100
commit3cfd9ce269f695e27c9f62cbd95b7a3b60963581 (patch)
treeca1faaae5c7d0fbd756f4cee56f61500ba0a12ed /src/Globals.h
parentFixed #620 (diff)
parentAdded missing files (diff)
downloadcuberite-3cfd9ce269f695e27c9f62cbd95b7a3b60963581.tar
cuberite-3cfd9ce269f695e27c9f62cbd95b7a3b60963581.tar.gz
cuberite-3cfd9ce269f695e27c9f62cbd95b7a3b60963581.tar.bz2
cuberite-3cfd9ce269f695e27c9f62cbd95b7a3b60963581.tar.lz
cuberite-3cfd9ce269f695e27c9f62cbd95b7a3b60963581.tar.xz
cuberite-3cfd9ce269f695e27c9f62cbd95b7a3b60963581.tar.zst
cuberite-3cfd9ce269f695e27c9f62cbd95b7a3b60963581.zip
Diffstat (limited to 'src/Globals.h')
-rw-r--r--src/Globals.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Globals.h b/src/Globals.h
index 7e53da80e..1e90d83e9 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -44,8 +44,10 @@
// TODO: Can GCC explicitly mark classes as abstract (no instances can be created)?
#define abstract
- // TODO: Can GCC mark virtual methods as overriding (forcing them to have a virtual function of the same signature in the base class)
- #define override
+ // override is part of c++11
+ #if __cplusplus < 201103L
+ #define override
+ #endif
#define OBSOLETE __attribute__((deprecated))