X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-check.cc;h=e2ed2e6e0491c25d1067071f780d37f7e257d06a;hb=9c3ecc7d6e596e8151a58ce7ed0dd9e1b0802d1e;hp=07d70acc45c82d003046dc18694d27c0d9c1d679;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index 07d70acc45..e2ed2e6e04 100644
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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 ();
 }