1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

Removed the JUCE_COMPILER_SUPPORTS_LAMBDAS macro

This commit is contained in:
tpoole 2017-06-22 09:32:47 +01:00
parent 253fd51a96
commit 984654318d
8 changed files with 10 additions and 26 deletions

View file

@ -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

View file

@ -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,

View file

@ -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

View file

@ -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();

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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<void (const char* data, int dataSize)> 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.