DEBUG_ASSERT condition is now considered as used.

Author: daschuer

src/control/controlobject.cpp

@@ -41,7 +41,6 @@ ControlObject::ControlObject(const ConfigKey& key,
 ControlObject::~ControlObject() {
     DEBUG_ASSERT(m_pControl);
     const bool success = m_pControl->resetCreatorCO(this);
-    Q_UNUSED(success);
     DEBUG_ASSERT(success);
 }
 

src/library/dao/autodjcratesdao.cpp

@@ -43,10 +43,8 @@ namespace {
 constexpr int kLeastPreferredPercent = 15;
 
 // These consts are only used for DEBUG_ASSERTs
-#ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
 constexpr int kLeastPreferredPercentMin = 0;
 constexpr int kLeastPreferredPercentMax = 50;
-#endif
 
 int bounded_rand(int highest) {
     return QRandomGenerator::global()->bounded(highest);

src/qml/qmlwaveformoverview.cpp

@@ -76,7 +76,6 @@ void QmlWaveformOverview::slotTrackLoaded(TrackPointer pTrack) {
 }
 
 void QmlWaveformOverview::slotTrackLoading(TrackPointer pNewTrack, TrackPointer pOldTrack) {
-    Q_UNUSED(pOldTrack); // only used in DEBUG_ASSERT
     DEBUG_ASSERT(m_pCurrentTrack == pOldTrack);
     setCurrentTrack(pNewTrack);
 }

src/sources/soundsourcemp3.cpp

@@ -105,15 +105,11 @@ void logFrameHeader(QDebug logger, const mad_header& madHeader) {
            << "flags:" << formatHeaderFlags(madHeader.flags);
 }
 
-inline bool isUnrecoverableError(mad_error error) {
+bool isUnrecoverableError(mad_error error) {
     return (MAD_ERROR_NONE != error) && !MAD_RECOVERABLE(error);
 }
 
-#ifndef MIXXX_DEBUG_ASSERTIONS_ENABLED
-[[maybe_unused]]
-#endif
-inline bool
-hasUnrecoverableError(const mad_stream* pMadStream) {
+bool hasUnrecoverableError(const mad_stream* pMadStream) {
     if (pMadStream) {
         return isUnrecoverableError(pMadStream->error);
     }

src/track/beats.cpp

@@ -60,9 +60,7 @@ Beats::ConstIterator Beats::ConstIterator::operator+=(Beats::ConstIterator::diff
     }
 
     DEBUG_ASSERT(n > 0);
-#ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
-    const auto origValue = m_value;
-#endif
+    const audio::FramePos origValue = m_value;
 
     // Detect integer overflow in `m_beatOffset + n`
     const int maxBeatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::max();
@@ -108,9 +106,7 @@ Beats::ConstIterator Beats::ConstIterator::operator-=(Beats::ConstIterator::diff
     }
 
     DEBUG_ASSERT(n > 0);
-#ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
-    const auto origValue = m_value;
-#endif
+    const audio::FramePos origValue = m_value;
 
     // Detect integer overflow
     const int minBeatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::lowest();

src/util/assert.h

@@ -49,10 +49,10 @@ inline void mixxx_release_assert(const char* assertion, const char* file, int li
 /// MIXXX_DEBUG_ASSERTIONS_FATAL then the warning message is fatal. Compiles
 /// to nothing in release builds.
 ///
-/// Be careful of the common mistake with assertions:
+/// In release builds, it marks cond as used and checks if it can be converted
+/// to bool. Be careful of the common mistake with assertions:
 ///   DEBUG_ASSERT(doSomething());
-///
-/// In release builds, doSomething() is never called!
+/// doSomething() is never called, in In release builds.
 #ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
 #define DEBUG_ASSERT(cond)                                                  \
     do                                                                      \
@@ -61,8 +61,9 @@ inline void mixxx_release_assert(const char* assertion, const char* file, int li
         }                                                                   \
     while (0)
 #else
-#define DEBUG_ASSERT(cond) \
-    do {                   \
+#define DEBUG_ASSERT(cond)                                                \
+    do {                                                                  \
+        [[maybe_unused]] std::size_t s = sizeof(static_cast<bool>(cond)); \
     } while (0)
 #endif