From cd34f859f21ed5a27653f61cb57ff8aeb4acec77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 10 Feb 2013 13:24:49 +0100
Subject: Turn off override support for GCC in non-c++11 mode.

Change-Id: Id4e7394c12f1bf980833dd3e9668aa00950e709f

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
-- 
cgit v0.10.2-6-g49f6