From 8c7e63b35b1f929dff7176406a7a1c69e6262d92 Mon Sep 17 00:00:00 2001 From: Hussam al-Homsi Date: Tue, 9 Jun 2020 20:45:45 -0400 Subject: [PATCH] Remove macros likely() and unlikely() (#5530) * Remove macros likely() and unlikely(): https://github.com/LMMS/lmms/pull/5530/#issue-431515330 * Remove only use of macro Q_UNLIKELY(): https://github.com/LMMS/lmms/pull/5530/#issuecomment-641634577 --- include/AutomatableModel.h | 2 +- include/lmms_basics.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h index 25039eb0d..c332858b7 100644 --- a/include/AutomatableModel.h +++ b/include/AutomatableModel.h @@ -148,7 +148,7 @@ public: template inline T value( int frameOffset = 0 ) const { - if( unlikely( hasLinkedModels() || m_controllerConnection != NULL ) ) + if( hasLinkedModels() || m_controllerConnection != NULL ) { return castValue( controllerValue( frameOffset ) ); } diff --git a/include/lmms_basics.h b/include/lmms_basics.h index 961810856..77a246498 100644 --- a/include/lmms_basics.h +++ b/include/lmms_basics.h @@ -55,9 +55,6 @@ typedef uint16_t fx_ch_t; // FX-channel (0 to MAX_EFFECT_CHANNEL) typedef uint32_t jo_id_t; // (unique) ID of a journalling object -// use for improved branch prediction -#define likely(x) Q_LIKELY(x) -#define unlikely(x) Q_UNLIKELY(x) // windows headers define "min" and "max" macros, breaking the methods bwloe #undef min