Doc: Included/compile.itexi - CG 4.2 - Updated notes on reqs for compiling

[lilypond.git] / lily / midi-item.cc

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index a08c60b89a4c7ccfc80c6265f8ed84cfa2686e5d..542e2b0df20ecbd94f3ce9240bb2207ec3e2f0a6 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -30,6 +30,8 @@
 #include "warn.hh"
 #include "lily-imports.hh"
 
+using std::string;
+
 #define PITCH_WHEEL_CENTER 0x2000
 #define PITCH_WHEEL_SEMITONE 0X1000
 
@@ -193,7 +195,7 @@ Midi_time_signature::to_string () const
 Midi_note::Midi_note (Audio_note *a)
   : Midi_channel_item (a),
     audio_ (a),
-    dynamic_byte_ (min (max (Byte ((a->dynamic_ && a->dynamic_->volume_ >= 0
+    dynamic_byte_ (std::min (std::max (Byte ((a->dynamic_ && a->dynamic_->volume_ >= 0
                                     ? a->dynamic_->volume_ * 0x7f : 0x5a)
                                    + a->extra_velocity_),
                              Byte (0)), Byte (0x7f)))
@@ -426,5 +428,5 @@ Midi_control_function_value_change::to_string () const
 char const *
 Midi_item::name () const
 {
-  return this->class_name ();
+  return class_name ();
 }