X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpure-from-neighbor-interface.cc;h=cffe887d1437fd0eb9bc3234eaad0ba286446297;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e6bc924aea6a9bc21619caab5804394d8c621a70;hpb=b64dcb418b66fb57b41067381ada9127a0e7e671;p=lilypond.git

diff --git a/lily/pure-from-neighbor-interface.cc b/lily/pure-from-neighbor-interface.cc
index e6bc924aea..cffe887d14 100644
--- a/lily/pure-from-neighbor-interface.cc
+++ b/lily/pure-from-neighbor-interface.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2011 Mike Solomon <mike@apollinemike.com>
+  Copyright (C) 2011--2015 Mike Solomon <mike@mikesolomon.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,23 +31,23 @@ MAKE_SCHEME_CALLBACK (Pure_from_neighbor_interface, calc_pure_relevant_grobs, 1)
 SCM
 Pure_from_neighbor_interface::calc_pure_relevant_grobs (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = Grob::unsmob (smob);
   extract_grob_set ((me->original () && me->original ()->is_live ()
-                      ? me->original ()
-                      : me),
-                     "neighbors",
-                     elts);
+                     ? me->original ()
+                     : me),
+                    "neighbors",
+                    elts);
 
   vector<Grob *> new_elts;
   new_elts.insert (new_elts.end (), elts.begin (), elts.end ());
 
   SCM neighbors_scm = me->get_object ("neighbors");
-  if (Grob_array::unsmob (neighbors_scm))
-     {
-       vector<Grob *> &arr
-         = unsmob_grob_array (neighbors_scm)->array_reference ();
-       arr = new_elts;
-     }
+  if (Grob_array::is_smob (neighbors_scm))
+    {
+      vector<Grob *> &arr
+        = Grob_array::unsmob (neighbors_scm)->array_reference ();
+      arr = new_elts;
+    }
 
   return Axis_group_interface::internal_calc_pure_relevant_grobs (me, "neighbors");
 }