Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / relative-octave-check.cc

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 07d70acc45c82d003046dc18694d27c0d9c1d679..cc1efe3d2117c56b34d426a7bf6897981028971f 100644 (file)
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -9,7 +9,6 @@
 #include "input.hh"
 #include "international.hh"
 #include "music.hh"
-#include "pitch.hh"
 
 class Relative_octave_check
 {
@@ -36,7 +35,7 @@ Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
 
       if (result != *check_p)
        {
-         std::string s = _ ("Failed octave check, got: ");
+         string s = _ ("Failed octave check, got: ");
          s += result.to_string ();
 
          m->origin ()->warning (s);
@@ -46,5 +45,6 @@ Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
     }
 
   return Pitch (p.get_octave () + delta_oct,
-               p.get_notename (), p.get_alteration ()).smobbed_copy ();
+               p.get_notename (),
+               p.get_alteration ()).smobbed_copy ();
 }