Issue 4568: Check in Texinfo from upstream svn://svn.savannah.gnu.org/texinfo/trunk...

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 9f840efd2524eedc28e7204a13d5c5f47d97a958..af083021cea180bd35f215ad5ed7b519db921834 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -20,7 +20,6 @@
 #include "performance.hh"
 
 #include <ctime>
-using namespace std;
 
 #include "audio-column.hh"
 #include "audio-item.hh"
@@ -35,6 +34,8 @@ using namespace std;
 #include "string-convert.hh"
 #include "warn.hh"
 
+using std::string;
+
 Performance::Performance (bool ports)
   : midi_ (0),
     ports_ (ports),
@@ -80,7 +81,7 @@ Performance::output (Midi_stream &midi_stream,
   Moment start_mom = 0;
   for (vsize i = 0; i < audio_elements_.size (); i++)
     if (Audio_item *item = dynamic_cast<Audio_item *>(audio_elements_[i]))
-      start_mom = min (start_mom, item->audio_column_->when ());
+      start_mom = std::min (start_mom, item->audio_column_->when ());
 
   for (vsize i = 0; i < audio_staffs_.size (); i++)
     {