avoid llabs ambiguity

(old gcc has a built-in)

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index d75dfea90f5acb6cbd2199b622ce8480336c9b1e..d443b9ad320b4128a90678b64fb671c240567237 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -962,7 +962,7 @@ AudioDiskstream::internal_playback_seek (framecnt_t distance)
        boost::shared_ptr<ChannelList> c = channels.reader();
 
        for (chan = c->begin(); chan != c->end(); ++chan) {
-               (*chan)->playback_buf->increment_read_ptr (llabs(distance));
+               (*chan)->playback_buf->increment_read_ptr (::llabs(distance));
        }
 
        if (first_recordable_frame < max_framepos) {

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index e864df83c300eec7db9d2cc5756376dae80e60e8..40cbded61fa875369986ab126df560fb93b1da8c 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -329,7 +329,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
        if (!lm.locked()) {
                boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
                framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
-               if (can_internal_playback_seek(llabs(playback_distance))) {
+               if (can_internal_playback_seek(::llabs(playback_distance))) {
                        /* TODO should declick */
                        internal_playback_seek(playback_distance);
                }

diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index 621984702df11fb200247af762cf2ec4137b4e1c..ab84cf6201b11aa4153b82561a019446d7f7af70 100644 (file)
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -610,7 +610,7 @@ LTC_Slave::approximate_current_delta() const
        } else {
                snprintf(delta, sizeof(delta), "\u0394<span foreground=\"%s\" face=\"monospace\" >%s%s%lld</span>sm",
                                sync_lock_broken ? "red" : "green",
-                               LEADINGZERO(llabs(current_delta)), PLUSMINUS(-current_delta), llabs(current_delta));
+                               LEADINGZERO(::llabs(current_delta)), PLUSMINUS(-current_delta), ::llabs(current_delta));
        }
        return std::string(delta);
 }

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 4883e8a7812552d43a840d87ba660c3b286fca04..e48d516575c160703b170ba59cecb0886d7280f9 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -356,7 +356,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
        if (!lm.locked()) {
                boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
                framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
-               if (can_internal_playback_seek(llabs(playback_distance))) {
+               if (can_internal_playback_seek(::llabs(playback_distance))) {
                        /* TODO should declick, and/or note-off */
                        internal_playback_seek(playback_distance);
                }

diff --git a/libs/timecode/src/time.cc b/libs/timecode/src/time.cc
index 1fd78c1abbf4003be7700d8b829e41fbe7a2b81d..b3d6b15a851dba802b2c91e4c1da0fe58c275a0a 100644 (file)
--- a/libs/timecode/src/time.cc
+++ b/libs/timecode/src/time.cc
@@ -770,7 +770,7 @@ sample_to_timecode (
 
        if (!use_offset) {
                timecode.negative = (sample < 0);
-               offset_sample = llabs(sample);
+               offset_sample = ::llabs(sample);
        } else {
                if (offset_is_negative) {
                        offset_sample = sample + offset_samples;