MidiClock_SlaveTest: add basic framework

[ardour.git] / libs / ardour / tempo.cc

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 5616c489ff30a8da56013cd279391504a7a0bf2e..9dcce637e63d839481003c359ffe034e91047fb3 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -24,7 +24,6 @@
 
 #include <cmath>
 
-#include <sigc++/bind.h>
 
 #include <glibmm/thread.h>
 #include "pbd/xml++.h"
@@ -1688,7 +1687,7 @@ TempoMap::bbt_add (const BBT_Time& start, const BBT_Time& other) const
  * add the BBT interval @param increment to  @param start and return the result
  */
 BBT_Time
-TempoMap::bbt_add (const BBT_Time& start, const BBT_Time& increment, const TempoMetric& metric) const
+TempoMap::bbt_add (const BBT_Time& start, const BBT_Time& increment, const TempoMetric& /*metric*/) const
 {
        BBT_Time result = start;
        BBT_Time op = increment; /* argument is const, but we need to modify it */
@@ -1823,7 +1822,8 @@ TempoMap::bbt_subtract (const BBT_Time& start, const BBT_Time& decrement) const
        */
        
        const MeterSection* meter = 0;
-       list<const MeterSection*>::const_reverse_iterator next_meter;
+       list<const MeterSection*>::reverse_iterator next_meter; // older versions of GCC don't 
+                                                               // support const_reverse_iterator::operator!=()
        
        for (next_meter = meter_sections.rbegin(); next_meter != meter_sections.rend(); ++next_meter) {