Browse Source

Removed the JUCE_COMPILER_SUPPORTS_LAMBDAS macro

tags/2021-05-28
tpoole 8 years ago
parent
commit
984654318d
8 changed files with 10 additions and 26 deletions
  1. +0
    -1
      doxygen/Doxyfile
  2. +1
    -1
      examples/Demo/Source/Demos/FlexBoxDemo.cpp
  3. +0
    -1
      extras/BLOCKS/doxygen/Doxyfile
  4. +6
    -10
      modules/juce_core/maths/juce_NormalisableRange.h
  5. +1
    -7
      modules/juce_core/system/juce_CompilerSupport.h
  6. +1
    -1
      modules/juce_gui_basics/juce_gui_basics.cpp
  7. +1
    -1
      modules/juce_gui_basics/juce_gui_basics.h
  8. +0
    -4
      modules/juce_osc/osc/juce_OSCReceiver.h

+ 0
- 1
doxygen/Doxyfile View File

@@ -2058,7 +2058,6 @@ PREDEFINED = WIN32=1 \
JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS=1 \ JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS=1 \
JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES=1 \ JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES=1 \
JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL=1 \ JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL=1 \
JUCE_COMPILER_SUPPORTS_LAMBDAS=1 \
JUCE_MODAL_LOOPS_PERMITTED=1 JUCE_MODAL_LOOPS_PERMITTED=1


# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this


+ 1
- 1
examples/Demo/Source/Demos/FlexBoxDemo.cpp View File

@@ -27,7 +27,7 @@
#include "../JuceDemoHeader.h" #include "../JuceDemoHeader.h"
// these classes are C++11-only // 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, struct DemoFlexPanel : public juce::Component,
private juce::TextEditor::Listener, private juce::TextEditor::Listener,


+ 0
- 1
extras/BLOCKS/doxygen/Doxyfile View File

@@ -2069,7 +2069,6 @@ PREDEFINED = WIN32=1 \
JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS=1 \ JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS=1 \
JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES=1 \ JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES=1 \
JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL=1 \ JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL=1 \
JUCE_COMPILER_SUPPORTS_LAMBDAS=1 \
JUCE_MODAL_LOOPS_PERMITTED=1 JUCE_MODAL_LOOPS_PERMITTED=1


# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this


+ 6
- 10
modules/juce_core/maths/juce_NormalisableRange.h View File

@@ -47,12 +47,10 @@ public:
NormalisableRange (const NormalisableRange& other) noexcept NormalisableRange (const NormalisableRange& other) noexcept
: start (other.start), end (other.end), : start (other.start), end (other.end),
interval (other.interval), skew (other.skew), 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(); checkInvariants();
} }
@@ -65,11 +63,9 @@ public:
interval = other.interval; interval = other.interval;
skew = other.skew; skew = other.skew;
symmetricSkew = other.symmetricSkew; symmetricSkew = other.symmetricSkew;
#if JUCE_COMPILER_SUPPORTS_LAMBDAS
convertFrom0To1Function = other.convertFrom0To1Function;
convertTo0To1Function = other.convertTo0To1Function;
convertFrom0To1Function = other.convertFrom0To1Function;
convertTo0To1Function = other.convertTo0To1Function;
snapToLegalValueFunction = other.snapToLegalValueFunction; snapToLegalValueFunction = other.snapToLegalValueFunction;
#endif
checkInvariants(); checkInvariants();


+ 1
- 7
modules/juce_core/system/juce_CompilerSupport.h View File

@@ -42,8 +42,7 @@
#define JUCE_DELETED_FUNCTION = delete #define JUCE_DELETED_FUNCTION = delete
#endif #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 #define JUCE_STDLIB_HAS_STD_FUNCTION_SUPPORT 1
#endif #endif
@@ -66,10 +65,6 @@
#define JUCE_DELETED_FUNCTION = delete #define JUCE_DELETED_FUNCTION = delete
#endif #endif
#if __has_feature (cxx_lambdas)
#define JUCE_COMPILER_SUPPORTS_LAMBDAS 1
#endif
#if (defined (_LIBCPP_VERSION) || ! (JUCE_MAC || JUCE_IOS)) #if (defined (_LIBCPP_VERSION) || ! (JUCE_MAC || JUCE_IOS))
#define JUCE_STDLIB_HAS_STD_FUNCTION_SUPPORT 1 #define JUCE_STDLIB_HAS_STD_FUNCTION_SUPPORT 1
#endif #endif
@@ -104,7 +99,6 @@
#if _MSC_VER >= 1700 #if _MSC_VER >= 1700
#define JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL 1 #define JUCE_COMPILER_SUPPORTS_OVERRIDE_AND_FINAL 1
#define JUCE_COMPILER_SUPPORTS_LAMBDAS 1
#endif #endif
#if _MSC_VER >= 1800 #if _MSC_VER >= 1800


+ 1
- 1
modules/juce_gui_basics/juce_gui_basics.cpp View File

@@ -258,7 +258,7 @@ extern bool juce_areThereAnyAlwaysOnTopWindows();
#include "misc/juce_JUCESplashScreen.cpp" #include "misc/juce_JUCESplashScreen.cpp"
// these classes are C++11-only // 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" #include "layout/juce_FlexBox.cpp"
#endif #endif


+ 1
- 1
modules/juce_gui_basics/juce_gui_basics.h View File

@@ -292,7 +292,7 @@ class FlexBox;
#endif #endif
// these classes are C++11-only // 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_FlexItem.h"
#include "layout/juce_FlexBox.h" #include "layout/juce_FlexBox.h"
#endif #endif


+ 0
- 4
modules/juce_osc/osc/juce_OSCReceiver.h View File

@@ -189,11 +189,7 @@ public:
The arguments passed are the pointer to and the data of the buffer that The arguments passed are the pointer to and the data of the buffer that
the OSCReceiver has failed to parse. the OSCReceiver has failed to parse.
*/ */
#if JUCE_COMPILER_SUPPORTS_LAMBDAS
typedef std::function<void (const char* data, int dataSize)> FormatErrorHandler; 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 /** 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. encounters a stream it cannot parse as an OSC bundle or OSC message.


Loading…
Cancel
Save