summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-02-10 12:24:49 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-02-10 12:24:49 (GMT)
commitcd34f859f21ed5a27653f61cb57ff8aeb4acec77 (patch)
treebde96290ab693dabfe297df556d9e05436c8ebbe
parent743daff856b6d71848b045a6587f9ae102f5f94f (diff)
downloadswift-cd34f859f21ed5a27653f61cb57ff8aeb4acec77.zip
swift-cd34f859f21ed5a27653f61cb57ff8aeb4acec77.tar.bz2
Turn off override support for GCC in non-c++11 mode.
Change-Id: Id4e7394c12f1bf980833dd3e9668aa00950e709f
-rw-r--r--Swiften/Base/Override.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Base/Override.h b/Swiften/Base/Override.h
index 7f410cf..6d9baaa 100644
--- a/Swiften/Base/Override.h
+++ b/Swiften/Base/Override.h
@@ -14,7 +14,7 @@
# endif
#elif defined(__GNUC__)
-# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))
+# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) && defined(__GXX_EXPERIMENTAL_CXX0X__)
# define SWIFTEN_OVERRIDE override
# else
# define SWIFTEN_OVERRIDE