Run grand replace for 2015.

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 9179e1e5609fae5fd59f43d487022d94e572fa18..22c24b76b2f8ac3937dd38347f1b8dbd50aa16fe 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -219,7 +219,7 @@ Slur::replace_breakable_encompass_objects (Grob *me)
     }
 
   SCM encompass_scm = me->get_object ("encompass-objects");
-  if (Grob_array::unsmob (encompass_scm))
+  if (Grob_array::is_smob (encompass_scm))
     {
       vector<Grob *> &arr
         = Grob_array::unsmob (encompass_scm)->array_reference ();
@@ -423,8 +423,8 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info,
       if (slur)
         {
           chain_offset_callback (e,
-                                 ly_make_unpure_pure_container (outside_slur_callback_proc,
-                                                                pure_outside_slur_callback_proc),
+                                 Unpure_pure_container::make_smob (outside_slur_callback_proc,
+                                                                   pure_outside_slur_callback_proc),
                                  Y_AXIS);
           chain_callback (e, outside_slur_cross_staff_proc, ly_symbol2scm ("cross-staff"));
           e->set_object ("slur", slur->self_scm ());