From 886cd92edaaeac68983d4a07a8f16224cb0b9f5b Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 2 May 2013 20:13:02 +0100 Subject: [PATCH] Removed the fake "final" keyword, which was clashing with some 3rd-party headers. --- modules/juce_core/system/juce_PlatformDefs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h index bf308138b6..0e34ef4e2f 100644 --- a/modules/juce_core/system/juce_PlatformDefs.h +++ b/modules/juce_core/system/juce_PlatformDefs.h @@ -323,7 +323,7 @@ namespace juce #define JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL 1 #endif -#if (! JUCE_CLANG) && defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 40700 +#if (! JUCE_CLANG) && defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 407 #define JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL 1 #endif @@ -349,8 +349,6 @@ namespace juce #if ! (DOXYGEN || JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL) #undef override #define override - #undef final - #define final #endif #endif // __JUCE_PLATFORMDEFS_JUCEHEADER__