diff --git a/examples/GUI/DialogsDemo.h b/examples/GUI/DialogsDemo.h index 77b692d43a..b7d5b8243e 100644 --- a/examples/GUI/DialogsDemo.h +++ b/examples/GUI/DialogsDemo.h @@ -403,8 +403,7 @@ private: if (wi.get() != nullptr && wo.get() != nullptr) { auto numWritten = wo->writeFromInputStream (*wi, -1); - jassert (numWritten > 0); - ignoreUnused (numWritten); + jassertquiet (numWritten > 0); wo->flush(); } } diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 463a3e4f54..cf8490033c 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -671,8 +671,7 @@ Result Project::loadDocument (const File& file) Result Project::saveDocument (const File& file) { - jassert (file == getFile()); - ignoreUnused (file); + jassertquiet (file == getFile()); auto sharedResult = Result::ok(); @@ -686,8 +685,7 @@ Result Project::saveDocument (const File& file) void Project::saveDocumentAsync (const File& file, std::function afterSave) { - jassert (file == getFile()); - ignoreUnused (file); + jassertquiet (file == getFile()); saveProject (Async::yes, nullptr, std::move (afterSave)); } diff --git a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp index 2c353c6785..662a4bacbc 100644 --- a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp +++ b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp @@ -347,8 +347,7 @@ public: if (client != nullptr) { const auto result = juce::jack_deactivate (client); - jassert (result == 0); - ignoreUnused (result); + jassertquiet (result == 0); juce::jack_set_xrun_callback (client, xrunCallback, nullptr); juce::jack_set_process_callback (client, processCallback, nullptr); @@ -543,8 +542,7 @@ private: static void infoShutdownCallback (jack_status_t code, const char* reason, void* arg) { - jassert (code == 0); - ignoreUnused (code); + jassertquiet (code == 0); JUCE_JACK_LOG ("Shutting down with message:"); JUCE_JACK_LOG (reason); diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp index 87ee55f89b..4cb4b3bef6 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp @@ -132,7 +132,7 @@ namespace AAXClasses static void check (AAX_Result result) { - jassert (result == AAX_SUCCESS); ignoreUnused (result); + jassertquiet (result == AAX_SUCCESS); } // maps a channel index of an AAX format to an index of a juce format @@ -1269,8 +1269,7 @@ namespace AAXClasses { auto currentLayout = getDefaultLayout (p, true); bool success = p.checkBusesLayoutSupported (currentLayout); - jassert (success); - ignoreUnused (success); + jassertquiet (success); auto numInputBuses = p.getBusCount (true); auto numOutputBuses = p.getBusCount (false); diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h index 939cae9712..71695c01a8 100644 --- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h +++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h @@ -451,9 +451,8 @@ private: int numOutputChannels, int numSamples) override { - jassert ((int) storedInputChannels.size() == numInputChannels); - jassert ((int) storedOutputChannels.size() == numOutputChannels); - ignoreUnused (numInputChannels, numOutputChannels); + jassertquiet ((int) storedInputChannels.size() == numInputChannels); + jassertquiet ((int) storedOutputChannels.size() == numOutputChannels); int position = 0; diff --git a/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp b/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp index c9c1831ae6..7d78eaacf1 100644 --- a/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp @@ -325,9 +325,7 @@ public: short configs[][2] = { JucePlugin_PreferredChannelConfigurations }; const int numConfigs = sizeof (configs) / sizeof (short[2]); - jassert (numConfigs > 0 && (configs[0][0] > 0 || configs[0][1] > 0)); - - ignoreUnused (numConfigs); + jassertquiet (numConfigs > 0 && (configs[0][0] > 0 || configs[0][1] > 0)); pluginInstance->setPlayConfigDetails (configs[0][0], configs[0][1], state->sampleRate, samplesPerBlock); #else diff --git a/modules/juce_core/containers/juce_ArrayBase.h b/modules/juce_core/containers/juce_ArrayBase.h index 711bb6122c..c6a55fe15b 100644 --- a/modules/juce_core/containers/juce_ArrayBase.h +++ b/modules/juce_core/containers/juce_ArrayBase.h @@ -591,8 +591,7 @@ private: // be deleted indirectly during the reallocation operation! To work around this, // make a local copy of the item you're trying to add (and maybe use std::move to // move it into the add() method to avoid any extra overhead) - jassert (std::addressof (element) < begin() || end() <= std::addressof (element)); - ignoreUnused (element); + jassertquiet (std::addressof (element) < begin() || end() <= std::addressof (element)); } //============================================================================== diff --git a/modules/juce_core/text/juce_Base64.cpp b/modules/juce_core/text/juce_Base64.cpp index b154157b55..dd4d1a8e01 100644 --- a/modules/juce_core/text/juce_Base64.cpp +++ b/modules/juce_core/text/juce_Base64.cpp @@ -109,8 +109,7 @@ String Base64::toBase64 (const void* sourceData, size_t sourceDataSize) { MemoryOutputStream m ((sourceDataSize * 4) / 3 + 3); bool ok = convertToBase64 (m, sourceData, sourceDataSize); - jassert (ok); // should always succeed for this simple case - ignoreUnused (ok); + jassertquiet (ok); // should always succeed for this simple case return m.toString(); } diff --git a/modules/juce_dsp/containers/juce_FixedSizeFunction.h b/modules/juce_dsp/containers/juce_FixedSizeFunction.h index d298c2d6b9..c5227d04be 100644 --- a/modules/juce_dsp/containers/juce_FixedSizeFunction.h +++ b/modules/juce_dsp/containers/juce_FixedSizeFunction.h @@ -73,7 +73,7 @@ namespace detail auto& fn = *reinterpret_cast (s); fn.~Fn(); // I know this looks insane, for some reason MSVC 14 sometimes thinks fn is unreferenced - juce::ignoreUnused (fn); + ignoreUnused (fn); } template @@ -138,8 +138,7 @@ public: vtable = &vtableForCallable; auto* ptr = new (&storage) Fn (std::forward (callable)); - jassert ((void*) ptr == (void*) &storage); - juce::ignoreUnused (ptr); + jassertquiet ((void*) ptr == (void*) &storage); } /** Move constructor. */ diff --git a/modules/juce_dsp/processors/juce_FIRFilter.h b/modules/juce_dsp/processors/juce_FIRFilter.h index 800eec7b11..63f21a6ce2 100644 --- a/modules/juce_dsp/processors/juce_FIRFilter.h +++ b/modules/juce_dsp/processors/juce_FIRFilter.h @@ -80,8 +80,7 @@ namespace FIR { // This class can only process mono signals. Use the ProcessorDuplicator class // to apply this filter on a multi-channel audio stream. - jassert (spec.numChannels == 1); - ignoreUnused (spec); + jassertquiet (spec.numChannels == 1); reset(); } diff --git a/modules/juce_dsp/processors/juce_Panner.h b/modules/juce_dsp/processors/juce_Panner.h index 3a524c2fa4..a133ac98fd 100644 --- a/modules/juce_dsp/processors/juce_Panner.h +++ b/modules/juce_dsp/processors/juce_Panner.h @@ -84,8 +84,7 @@ public: const auto numOutputChannels = outputBlock.getNumChannels(); const auto numSamples = outputBlock.getNumSamples(); - jassert (inputBlock.getNumSamples() == numSamples); - ignoreUnused (numSamples); + jassertquiet (inputBlock.getNumSamples() == numSamples); if (numOutputChannels != 2 || numInputChannels == 0 || numInputChannels > 2) return; diff --git a/modules/juce_events/native/juce_linux_Messaging.cpp b/modules/juce_events/native/juce_linux_Messaging.cpp index 0fb7364714..42de52f5bf 100644 --- a/modules/juce_events/native/juce_linux_Messaging.cpp +++ b/modules/juce_events/native/juce_linux_Messaging.cpp @@ -30,8 +30,7 @@ public: InternalMessageQueue() { auto err = ::socketpair (AF_LOCAL, SOCK_STREAM, 0, msgpipe); - jassert (err == 0); - ignoreUnused (err); + jassertquiet (err == 0); LinuxEventLoop::registerFdCallback (getReadHandle(), [this] (int fd) diff --git a/modules/juce_gui_basics/native/accessibility/juce_win32_Accessibility.cpp b/modules/juce_gui_basics/native/accessibility/juce_win32_Accessibility.cpp index 1faf73f4f7..d070fa9001 100644 --- a/modules/juce_gui_basics/native/accessibility/juce_win32_Accessibility.cpp +++ b/modules/juce_gui_basics/native/accessibility/juce_win32_Accessibility.cpp @@ -218,8 +218,7 @@ struct SpVoiceWrapper : public DeletedAtShutdown { auto hr = voice.CoCreateInstance (CLSID_SpVoice); - jassert (SUCCEEDED (hr)); - ignoreUnused (hr); + jassertquiet (SUCCEEDED (hr)); } ~SpVoiceWrapper() override diff --git a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp index e170261c52..4a2f8c697b 100644 --- a/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp @@ -141,9 +141,7 @@ ChoicePropertyComponent::ChoicePropertyComponent (const String& name, { // The array of corresponding values must contain one value for each of the items in // the choices array! - jassert (correspondingValues.size() == choices.size()); - - ignoreUnused (correspondingValues); + jassertquiet (correspondingValues.size() == choices.size()); } ChoicePropertyComponent::ChoicePropertyComponent (const Value& valueToControl, diff --git a/modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp b/modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp index d0a2785f18..2fe93e39ea 100644 --- a/modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp +++ b/modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp @@ -219,8 +219,7 @@ MultiChoicePropertyComponent::MultiChoicePropertyComponent (const String& proper { // The array of corresponding values must contain one value for each of the items in // the choices array! - jassert (choices.size() == correspondingValues.size()); - ignoreUnused (correspondingValues); + jassertquiet (choices.size() == correspondingValues.size()); for (auto choice : choices) addAndMakeVisible (choiceButtons.add (new ToggleButton (choice))); diff --git a/modules/juce_gui_basics/widgets/juce_Label.cpp b/modules/juce_gui_basics/widgets/juce_Label.cpp index 53bd3791dd..5a263be994 100644 --- a/modules/juce_gui_basics/widgets/juce_Label.cpp +++ b/modules/juce_gui_basics/widgets/juce_Label.cpp @@ -503,8 +503,7 @@ void Label::textEditorEscapeKeyPressed (TextEditor& ed) { if (editor != nullptr) { - jassert (&ed == editor.get()); - ignoreUnused (ed); + jassertquiet (&ed == editor.get()); editor->setText (textValue.toString(), false); hideEditor (true); diff --git a/modules/juce_video/native/juce_ios_CameraDevice.h b/modules/juce_video/native/juce_ios_CameraDevice.h index fc0de80942..3d7f84d035 100644 --- a/modules/juce_video/native/juce_ios_CameraDevice.h +++ b/modules/juce_video/native/juce_ios_CameraDevice.h @@ -59,9 +59,7 @@ struct CameraDevice::Pimpl { // Access to video is required for camera to work, // black images will be produced otherwise! - jassert (granted); - - ignoreUnused (granted); + jassertquiet (granted); }]; [AVCaptureDevice requestAccessForMediaType: AVMediaTypeAudio @@ -69,9 +67,7 @@ struct CameraDevice::Pimpl { // Access to audio is required for camera to work, // silence will be produced otherwise! - jassert (granted); - - ignoreUnused (granted); + jassertquiet (granted); }]; captureSession.startSessionForDeviceWithId (cameraId);