X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fskyline-pair.cc;h=bab43494a6c68564cbae3886b64a543749a72c5f;hb=818acffa19134b90126c7974cc3c99452626c8dd;hp=205fd889d5f879391a1f877b4fe04ab04ef5796a;hpb=8cd6c7945283badb27640b3a0020808ace14a27a;p=lilypond.git

diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc
index 205fd889d5..bab43494a6 100644
--- a/lily/skyline-pair.cc
+++ b/lily/skyline-pair.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2008--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2008--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -54,13 +54,6 @@ Skyline_pair::raise (Real r)
   skylines_[DOWN].raise (r);
 }
 
-void
-Skyline_pair::deholify ()
-{
-  skylines_[UP].deholify ();
-  skylines_[DOWN].deholify ();
-}
-
 void
 Skyline_pair::shift (Real r)
 {
@@ -127,14 +120,14 @@ Skyline_pair::operator [] (Direction d) const
   return skylines_[d];
 }
 
-const char Skyline_pair::type_p_name_[] = "ly:skyline-pair?";
+const char * const Skyline_pair::type_p_name_ = "ly:skyline-pair?";
 
 
 MAKE_SCHEME_CALLBACK (Skyline_pair, skyline, 2);
 SCM
 Skyline_pair::skyline (SCM smob, SCM dir_scm)
 {
-  Skyline_pair *sp = Skyline_pair::unsmob (smob);
+  Skyline_pair *sp = unsmob<Skyline_pair> (smob);
   Direction dir = robust_scm2dir (dir_scm, UP);
 
   if (dir == CENTER)