diff --git a/doxygen/Doxyfile b/doxygen/Doxyfile index 6fbfec64a3..c253eb0dbe 100644 --- a/doxygen/Doxyfile +++ b/doxygen/Doxyfile @@ -2058,7 +2058,6 @@ PREDEFINED = WIN32=1 \ JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS=1 \ JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES=1 \ JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL=1 \ - JUCE_COMPILER_SUPPORTS_LAMBDAS=1 \ JUCE_MODAL_LOOPS_PERMITTED=1 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/examples/Demo/Source/Demos/FlexBoxDemo.cpp b/examples/Demo/Source/Demos/FlexBoxDemo.cpp index 0d5064552f..0afd5a3aba 100644 --- a/examples/Demo/Source/Demos/FlexBoxDemo.cpp +++ b/examples/Demo/Source/Demos/FlexBoxDemo.cpp @@ -27,7 +27,7 @@ #include "../JuceDemoHeader.h" // these classes are C++11-only -#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS && JUCE_COMPILER_SUPPORTS_LAMBDAS +#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS struct DemoFlexPanel : public juce::Component, private juce::TextEditor::Listener, diff --git a/extras/BLOCKS/doxygen/Doxyfile b/extras/BLOCKS/doxygen/Doxyfile index 9729e672ef..08e613d670 100644 --- a/extras/BLOCKS/doxygen/Doxyfile +++ b/extras/BLOCKS/doxygen/Doxyfile @@ -2069,7 +2069,6 @@ PREDEFINED = WIN32=1 \ JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS=1 \ JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES=1 \ JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL=1 \ - JUCE_COMPILER_SUPPORTS_LAMBDAS=1 \ JUCE_MODAL_LOOPS_PERMITTED=1 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/modules/juce_core/maths/juce_NormalisableRange.h b/modules/juce_core/maths/juce_NormalisableRange.h index 22a41c3c8d..3f3794e151 100644 --- a/modules/juce_core/maths/juce_NormalisableRange.h +++ b/modules/juce_core/maths/juce_NormalisableRange.h @@ -47,12 +47,10 @@ public: NormalisableRange (const NormalisableRange& other) noexcept : start (other.start), end (other.end), interval (other.interval), skew (other.skew), - symmetricSkew (other.symmetricSkew) - #if JUCE_COMPILER_SUPPORTS_LAMBDAS - , convertFrom0To1Function (other.convertFrom0To1Function) - , convertTo0To1Function (other.convertTo0To1Function) - , snapToLegalValueFunction (other.snapToLegalValueFunction) - #endif + symmetricSkew (other.symmetricSkew), + convertFrom0To1Function (other.convertFrom0To1Function), + convertTo0To1Function (other.convertTo0To1Function), + snapToLegalValueFunction (other.snapToLegalValueFunction) { checkInvariants(); } @@ -65,11 +63,9 @@ public: interval = other.interval; skew = other.skew; symmetricSkew = other.symmetricSkew; - #if JUCE_COMPILER_SUPPORTS_LAMBDAS - convertFrom0To1Function = other.convertFrom0To1Function; - convertTo0To1Function = other.convertTo0To1Function; + convertFrom0To1Function = other.convertFrom0To1Function; + convertTo0To1Function = other.convertTo0To1Function; snapToLegalValueFunction = other.snapToLegalValueFunction; - #endif checkInvariants(); diff --git a/modules/juce_core/system/juce_CompilerSupport.h b/modules/juce_core/system/juce_CompilerSupport.h index fb5d53be2f..7efab0a8ff 100644 --- a/modules/juce_core/system/juce_CompilerSupport.h +++ b/modules/juce_core/system/juce_CompilerSupport.h @@ -42,8 +42,7 @@ #define JUCE_DELETED_FUNCTION = delete #endif - #if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && ! defined (JUCE_COMPILER_SUPPORTS_LAMBDAS) - #define JUCE_COMPILER_SUPPORTS_LAMBDAS 1 + #if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406 #define JUCE_STDLIB_HAS_STD_FUNCTION_SUPPORT 1 #endif @@ -66,10 +65,6 @@ #define JUCE_DELETED_FUNCTION = delete #endif - #if __has_feature (cxx_lambdas) - #define JUCE_COMPILER_SUPPORTS_LAMBDAS 1 - #endif - #if (defined (_LIBCPP_VERSION) || ! (JUCE_MAC || JUCE_IOS)) #define JUCE_STDLIB_HAS_STD_FUNCTION_SUPPORT 1 #endif @@ -104,7 +99,6 @@ #if _MSC_VER >= 1700 #define JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL 1 - #define JUCE_COMPILER_SUPPORTS_LAMBDAS 1 #endif #if _MSC_VER >= 1800 diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp index 3c1e54df04..d1358955ea 100644 --- a/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/modules/juce_gui_basics/juce_gui_basics.cpp @@ -258,7 +258,7 @@ extern bool juce_areThereAnyAlwaysOnTopWindows(); #include "misc/juce_JUCESplashScreen.cpp" // these classes are C++11-only -#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS && JUCE_COMPILER_SUPPORTS_LAMBDAS +#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS #include "layout/juce_FlexBox.cpp" #endif diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h index a874624b71..24f06b096e 100644 --- a/modules/juce_gui_basics/juce_gui_basics.h +++ b/modules/juce_gui_basics/juce_gui_basics.h @@ -292,7 +292,7 @@ class FlexBox; #endif // these classes are C++11-only -#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS && JUCE_COMPILER_SUPPORTS_LAMBDAS +#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS #include "layout/juce_FlexItem.h" #include "layout/juce_FlexBox.h" #endif diff --git a/modules/juce_osc/osc/juce_OSCReceiver.h b/modules/juce_osc/osc/juce_OSCReceiver.h index fc3bbd5ab3..63871192bc 100644 --- a/modules/juce_osc/osc/juce_OSCReceiver.h +++ b/modules/juce_osc/osc/juce_OSCReceiver.h @@ -189,11 +189,7 @@ public: The arguments passed are the pointer to and the data of the buffer that the OSCReceiver has failed to parse. */ - #if JUCE_COMPILER_SUPPORTS_LAMBDAS typedef std::function FormatErrorHandler; - #else - typedef void (*FormatErrorHandler) (const char* data, int dataSize); - #endif /** Installs a custom error handler which is called in case the receiver encounters a stream it cannot parse as an OSC bundle or OSC message.