Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove macros likely() and unlikely() #5530

Merged
merged 2 commits into from
Jun 10, 2020
Merged

Remove macros likely() and unlikely() #5530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc11adc
Remove macros likely() and unlikely()
husamalhomsi Jun 9, 2020
0df9ca7
Remove only use of macro Q_UNLIKELY()
husamalhomsi Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/AutomatableModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
template<class T>
inline T value( int frameOffset = 0 ) const
{
if( unlikely( hasLinkedModels() || m_controllerConnection != NULL ) )
if( Q_UNLIKELY( hasLinkedModels() || m_controllerConnection != NULL ) )
{
return castValue<T>( controllerValue( frameOffset ) );
}
Expand Down
3 changes: 0 additions & 3 deletions include/lmms_basics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down