From a653d01ac80ac1aef518551774257acbead915f0 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sat, 9 Dec 2017 07:55:30 +0000 Subject: [PATCH 1/2] Few code fixes since we re dealing with C++11 --- include/BBTrackContainer.h | 4 ++-- include/debug.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/BBTrackContainer.h b/include/BBTrackContainer.h index aaff75c38..0ac84b6d3 100644 --- a/include/BBTrackContainer.h +++ b/include/BBTrackContainer.h @@ -41,9 +41,9 @@ public: virtual bool play( MidiTime _start, const fpp_t _frames, const f_cnt_t _frame_base, int _tco_num = -1 ); - virtual void updateAfterTrackAdd(); + virtual void updateAfterTrackAdd() override; - inline virtual QString nodeName() const + inline virtual QString nodeName() const override { return "bbtrackcontainer"; } diff --git a/include/debug.h b/include/debug.h index bb5bce557..207c9680e 100644 --- a/include/debug.h +++ b/include/debug.h @@ -34,7 +34,9 @@ #ifdef LMMS_DEBUG #include #else + #ifndef assert #define assert(x) ((void)(x)) + #endif #endif #include From 5174bdaa0dfc973666c7226ee2e9739d6523ddd5 Mon Sep 17 00:00:00 2001 From: tresf Date: Mon, 11 Dec 2017 10:46:19 -0500 Subject: [PATCH 2/2] Spaces to tabs --- include/debug.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/debug.h b/include/debug.h index 207c9680e..55173f0a1 100644 --- a/include/debug.h +++ b/include/debug.h @@ -34,9 +34,9 @@ #ifdef LMMS_DEBUG #include #else - #ifndef assert - #define assert(x) ((void)(x)) - #endif + #ifndef assert + #define assert(x) ((void)(x)) + #endif #endif #include