Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / lily / grob-info.cc

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 72c2829032a5177031b008741a0ed9b2c16b9890..ee79e4ec661aebbc5414d4794dc5b8c804385336 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -50,7 +50,7 @@ Stream_event *
 Grob_info::event_cause () const
 {
   SCM cause = grob_->get_property ("cause");
-  return unsmob_stream_event (cause);
+  return Stream_event::unsmob (cause);
 }
 
 vector<Context *>
@@ -90,11 +90,11 @@ Stream_event *
 Grob_info::ultimate_event_cause () const
 {
   SCM cause = grob_->self_scm ();
-  while (Grob::unsmob (cause))
+  while (Grob::is_smob (cause))
     {
       cause = Grob::unsmob (cause)->get_property ("cause");
     }
-  return unsmob_stream_event (cause);
+  return Stream_event::unsmob (cause);
 }
 
 bool