diff --git a/source/modules/juce_audio_graph/containers/juce_Variant.cpp b/source/modules/juce_audio_graph/containers/juce_Variant.cpp index 04a82f8c4..82e7d424e 100644 --- a/source/modules/juce_audio_graph/containers/juce_Variant.cpp +++ b/source/modules/juce_audio_graph/containers/juce_Variant.cpp @@ -439,10 +439,6 @@ var::var() noexcept : type (&VariantType_Void::instance) {} var::var (const VariantType& t) noexcept : type (&t) {} var::~var() noexcept { type->cleanUp (value); } -#if JUCE_ALLOW_STATIC_NULL_VARIABLES -const var var::null; -#endif - //============================================================================== var::var (const var& valueToCopy) : type (valueToCopy.type) { diff --git a/source/modules/juce_audio_graph/files/juce_File.cpp b/source/modules/juce_audio_graph/files/juce_File.cpp index 602d5bf83..ebb32ed31 100644 --- a/source/modules/juce_audio_graph/files/juce_File.cpp +++ b/source/modules/juce_audio_graph/files/juce_File.cpp @@ -70,10 +70,6 @@ File& File::operator= (File&& other) noexcept } #endif -#if JUCE_ALLOW_STATIC_NULL_VARIABLES -const File File::nonexistent; -#endif - //============================================================================== static String removeEllipsis (const String& path) { diff --git a/source/modules/juce_audio_graph/files/juce_File.h b/source/modules/juce_audio_graph/files/juce_File.h index 0993b2ec7..66400dc5f 100644 --- a/source/modules/juce_audio_graph/files/juce_File.h +++ b/source/modules/juce_audio_graph/files/juce_File.h @@ -95,15 +95,6 @@ public: File& operator= (File&&) noexcept; #endif - //============================================================================== - #if JUCE_ALLOW_STATIC_NULL_VARIABLES - /** This static constant is used for referring to an 'invalid' file. - Bear in mind that you should avoid this kind of static variable, and always prefer - to use File() or {} if you need a default-constructed File object. - */ - static const File nonexistent; - #endif - //============================================================================== /** Checks whether the file actually exists. diff --git a/source/modules/juce_audio_graph/text/juce_StringArray.cpp b/source/modules/juce_audio_graph/text/juce_StringArray.cpp index d0f5875b6..5919568cf 100644 --- a/source/modules/juce_audio_graph/text/juce_StringArray.cpp +++ b/source/modules/juce_audio_graph/text/juce_StringArray.cpp @@ -119,12 +119,8 @@ const String& StringArray::operator[] (const int index) const noexcept if (isPositiveAndBelow (index, strings.size())) return strings.getReference (index); - #if JUCE_ALLOW_STATIC_NULL_VARIABLES - return String::empty; - #else static String empty; return empty; - #endif } String& StringArray::getReference (const int index) noexcept diff --git a/source/modules/juce_audio_graph/xml/juce_XmlElement.cpp b/source/modules/juce_audio_graph/xml/juce_XmlElement.cpp index d4b880370..ecc96bd47 100644 --- a/source/modules/juce_audio_graph/xml/juce_XmlElement.cpp +++ b/source/modules/juce_audio_graph/xml/juce_XmlElement.cpp @@ -466,12 +466,8 @@ int XmlElement::getNumAttributes() const noexcept static const String& getEmptyStringRef() noexcept { - #if JUCE_ALLOW_STATIC_NULL_VARIABLES - return String::empty; - #else static String empty; return empty; - #endif } const String& XmlElement::getAttributeName (const int index) const noexcept