summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-01-26 00:02:31 +0100
committerTycho <work.tycho+git@gmail.com>2014-01-26 00:02:31 +0100
commita2d3eea80be80be6c522943222c02b3861329e55 (patch)
treeb7aa00c9815abfc420cba74b6600343cbfc596ca /src
parentFirst attempt at Implementing Interfaces (diff)
downloadcuberite-a2d3eea80be80be6c522943222c02b3861329e55.tar
cuberite-a2d3eea80be80be6c522943222c02b3861329e55.tar.gz
cuberite-a2d3eea80be80be6c522943222c02b3861329e55.tar.bz2
cuberite-a2d3eea80be80be6c522943222c02b3861329e55.tar.lz
cuberite-a2d3eea80be80be6c522943222c02b3861329e55.tar.xz
cuberite-a2d3eea80be80be6c522943222c02b3861329e55.tar.zst
cuberite-a2d3eea80be80be6c522943222c02b3861329e55.zip
Diffstat (limited to 'src')
-rw-r--r--src/Globals.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Globals.h b/src/Globals.h
index d2080b8eb..6c0b4e0fd 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))