smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix llabs() ambiguity

Browse source 
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)
This commit is contained in:
Robin Gareus 2019-02-09 03:33:32 +01:00
parent 3f66bac4d0
commit 983875ffc8
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/disk_reader.cc
View file

@ -645,7 +645,7 @@ DiskReader::internal_playback_seek (sampleoffset_t distance)
boost::shared_ptr<ChannelList> c = channels.reader(); boost::shared_ptr<ChannelList> c = channels.reader();
for (chan = c->begin(); chan != c->end(); ++chan) { for (chan = c->begin(); chan != c->end(); ++chan) {
if (distance < 0) { 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 { } else {
off = (*chan)->rbuf->increment_read_ptr (distance); 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) 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; MidiBuffer* target;
samplepos_t nframes = llabs (end_sample - start_sample); samplepos_t nframes = ::llabs (end_sample - start_sample);
assert (_midi_buf); assert (_midi_buf);