diff options
| author | David Robillard <d@drobilla.net> | 2012-05-24 02:54:10 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-05-24 02:54:10 +0000 |
| commit | 27a1cf2cf73703267cac5bda2acca386afb374b3 (patch) | |
| tree | 122ceba55fef1d183d1b32dca1fd60ffdc113112 /libs/ardour/midi_playlist.cc | |
| parent | effe4de1889bfefba6550dff4244e06c2c7261bd (diff) | |
Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:
CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build
git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_playlist.cc')
| -rw-r--r-- | libs/ardour/midi_playlist.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 4bbedcecd8..9aa36304a6 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -21,6 +21,7 @@ #include <algorithm> #include <iostream> +#include <utility> #include <stdlib.h> @@ -257,10 +258,7 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst, framepos_t start, framec } else { if (new_tracker) { - pair<Region*,MidiStateTracker*> newpair; - newpair.first = mr.get(); - newpair.second = tracker; - _note_trackers.insert (newpair).first; + _note_trackers.insert (make_pair (mr.get(), tracker)); DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n"); } } |