From 27a1cf2cf73703267cac5bda2acca386afb374b3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 24 May 2012 02:54:10 +0000 Subject: 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 --- libs/ardour/midi_playlist.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libs/ardour/midi_playlist.cc') 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 #include +#include #include @@ -257,10 +258,7 @@ MidiPlaylist::read (Evoral::EventSink& dst, framepos_t start, framec } else { if (new_tracker) { - pair 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"); } } -- cgit v1.2.3