Issue 4131/3: Remove definitions of \partcombine*Once

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

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index c403b2ad9d293e01e10f10745e222ae3667c8caa..ba27fab768b62ee3479569bf01f79ac91c2fabb2 100644 (file)
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 #include "international.hh"
 #include "music.hh"
 
+using std::string;
+
 class Relative_octave_check
 {
 public:
@@ -31,9 +33,9 @@ MAKE_SCHEME_CALLBACK (Relative_octave_check, relative_callback, 2)
 SCM
 Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
 {
-  Pitch p = *unsmob_pitch (last_pitch);
-  Music *m = unsmob_music (music);
-  Pitch *check_p = unsmob_pitch (m->get_property ("pitch"));
+  Pitch p = *unsmob<Pitch> (last_pitch);
+  Music *m = unsmob<Music> (music);
+  Pitch *check_p = unsmob<Pitch> (m->get_property ("pitch"));
 
   int delta_oct = 0;
   if (check_p)