diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 023befd607..0688a90c16 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -271956,7 +271956,8 @@ JUCE_API bool JUCE_CALLTYPE Process::isRunningUnderDebugger() // compiled on its own). #if JUCE_INCLUDED_FILE -#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \ +#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \ + && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \ || (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) #define JUCE_CORETEXT_AVAILABLE 1 #endif @@ -276957,7 +276958,8 @@ MidiInput* MidiInput::openDevice (int index, MidiInputCallback* callback) { re // compiled on its own). #if JUCE_INCLUDED_FILE -#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \ +#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \ + && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \ || (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) #define JUCE_CORETEXT_AVAILABLE 1 #endif diff --git a/juce_amalgamated.h b/juce_amalgamated.h index 6e97b11b4f..2a237d8baa 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -73,7 +73,7 @@ namespace JuceDummyNamespace {} */ #define JUCE_MAJOR_VERSION 1 #define JUCE_MINOR_VERSION 53 -#define JUCE_BUILDNUMBER 80 +#define JUCE_BUILDNUMBER 81 /** Current Juce version number. @@ -21599,7 +21599,7 @@ class WeakReference { public: /** Creates a null SafePointer. */ - WeakReference() noexcept {} + inline WeakReference() noexcept {} /** Creates a WeakReference that points at the given object. */ WeakReference (ObjectType* const object) : holder (object != nullptr ? object->getWeakReference() : nullptr) {} diff --git a/src/core/juce_StandardHeader.h b/src/core/juce_StandardHeader.h index 9f728781fe..34d5848f6f 100644 --- a/src/core/juce_StandardHeader.h +++ b/src/core/juce_StandardHeader.h @@ -33,7 +33,7 @@ */ #define JUCE_MAJOR_VERSION 1 #define JUCE_MINOR_VERSION 53 -#define JUCE_BUILDNUMBER 80 +#define JUCE_BUILDNUMBER 81 /** Current Juce version number. diff --git a/src/memory/juce_WeakReference.h b/src/memory/juce_WeakReference.h index 7f3687cf7e..74751b4f2c 100644 --- a/src/memory/juce_WeakReference.h +++ b/src/memory/juce_WeakReference.h @@ -86,7 +86,7 @@ class WeakReference { public: /** Creates a null SafePointer. */ - WeakReference() noexcept {} + inline WeakReference() noexcept {} /** Creates a WeakReference that points at the given object. */ WeakReference (ObjectType* const object) : holder (object != nullptr ? object->getWeakReference() : nullptr) {} diff --git a/src/native/mac/juce_mac_Fonts.mm b/src/native/mac/juce_mac_Fonts.mm index 03f6a08fbf..c2cc00b5e1 100644 --- a/src/native/mac/juce_mac_Fonts.mm +++ b/src/native/mac/juce_mac_Fonts.mm @@ -27,7 +27,8 @@ // compiled on its own). #if JUCE_INCLUDED_FILE -#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) \ +#if (JUCE_MAC && defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 \ + && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) \ || (JUCE_IOS && defined (__IPHONE_3_0) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_2) #define JUCE_CORETEXT_AVAILABLE 1 #endif