hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Remove macros likely() and unlikely() (#5530)

Browse Source 
* 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
This commit is contained in:
Hussam al-Homsi
2020-06-09 20:45:45 -04:00
committed by GitHub
parent a05306131b
commit 8c7e63b35b
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AutomatableModel.h
View File

@@ -148,7 +148,7 @@ public:
template<class T>
inline T value( int frameOffset = 0 ) const
{
if( unlikely( hasLinkedModels() || m_controllerConnection != NULL ) )
if( hasLinkedModels() || m_controllerConnection != NULL )
{
return castValue<T>( controllerValue( frameOffset ) );
}

3
include/lmms_basics.h
View File

@@ -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