Browse Source

Removed the fake "final" keyword, which was clashing with some 3rd-party headers.

tags/2021-05-28
jules 12 years ago
parent
commit
886cd92eda
1 changed files with 1 additions and 3 deletions
  1. +1
    -3
      modules/juce_core/system/juce_PlatformDefs.h

+ 1
- 3
modules/juce_core/system/juce_PlatformDefs.h View File

@@ -323,7 +323,7 @@ namespace juce
#define JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL 1 #define JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL 1
#endif #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 #define JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL 1
#endif #endif
@@ -349,8 +349,6 @@ namespace juce
#if ! (DOXYGEN || JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL) #if ! (DOXYGEN || JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL)
#undef override #undef override
#define override #define override
#undef final
#define final
#endif #endif
#endif // __JUCE_PLATFORMDEFS_JUCEHEADER__ #endif // __JUCE_PLATFORMDEFS_JUCEHEADER__

Loading…
Cancel
Save