Merge remote-tracking branch 'origin/release/unstable' into HEAD

[lilypond.git] / lily / enclosing-bracket.cc

diff --git a/lily/enclosing-bracket.cc b/lily/enclosing-bracket.cc
index 0ae950879e987f65564b2299bc4f9f371491f7fd..dd551e38414078c28ad515f4c57fec667af3da61 100644 (file)
--- a/lily/enclosing-bracket.cc
+++ b/lily/enclosing-bracket.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
@@ -26,7 +26,6 @@
 
 struct Enclosing_bracket
 {
-  DECLARE_GROB_INTERFACE ();
 
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
@@ -54,7 +53,7 @@ Enclosing_bracket::width (SCM grob)
   /*
      UGH. cut & paste code.
   */
-  Grob *me = Grob::unsmob (grob);
+  Grob *me = unsmob<Grob> (grob);
   extract_grob_set (me, "elements", elements);
   if (elements.empty ())
     {
@@ -82,7 +81,7 @@ MAKE_SCHEME_CALLBACK (Enclosing_bracket, print, 1);
 SCM
 Enclosing_bracket::print (SCM grob)
 {
-  Grob *me = Grob::unsmob (grob);
+  Grob *me = unsmob<Grob> (grob);
   extract_grob_set (me, "elements", elements);
   if (elements.empty ())
     {