diff options
| author | Robin Gareus <robin@gareus.org> | 2019-02-09 03:33:32 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-02-09 03:33:32 +0100 |
| commit | 983875ffc8c6adb529a10f88e539ecef359ead1d (patch) | |
| tree | 61cfb115528b6ae6c79e2a8010404d9eb3c56fb3 | |
| parent | 3f66bac4d0dcafe9239fa68547894eb3a9135ca5 (diff) | |
Fix llabs() ambiguity
some older systems (e.g. OSX/PPC) fail to compile with
error: call of overloaded 'llabs(long long int)' is ambiguous
candidates are:
long long int llabs(long long int)
long long int __gnu_cxx::llabs(long long int)
| -rw-r--r-- | libs/ardour/disk_reader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 80e7126f76..1d09fe0353 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -645,7 +645,7 @@ DiskReader::internal_playback_seek (sampleoffset_t distance) boost::shared_ptr<ChannelList> c = channels.reader(); for (chan = c->begin(); chan != c->end(); ++chan) { if (distance < 0) { - off = 0 - (sampleoffset_t) (*chan)->rbuf->decrement_read_ptr (llabs (distance)); + off = 0 - (sampleoffset_t) (*chan)->rbuf->decrement_read_ptr (::llabs (distance)); } else { off = (*chan)->rbuf->increment_read_ptr (distance); } @@ -1109,7 +1109,7 @@ void DiskReader::get_midi_playback (MidiBuffer& dst, samplepos_t start_sample, samplepos_t end_sample, MonitorState ms, BufferSet& scratch_bufs, double speed, samplecnt_t disk_samples_to_consume) { MidiBuffer* target; - samplepos_t nframes = llabs (end_sample - start_sample); + samplepos_t nframes = ::llabs (end_sample - start_sample); assert (_midi_buf); |