Issue 4550 (1/2) Avoid "using namespace std;" in included files

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

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 3a90b8c896eb37a4c9069200a057d86a4e02257d..fa4b63c8cb5e022e1eef52cbd4c9ed296ebda0b3 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
@@ -25,6 +25,8 @@
 #include "stream-event.hh"
 #include "translator-group.hh"
 
+using std::vector;
+
 Grob_info::Grob_info (Translator *t, Grob *g)
 {
   origin_trans_ = t;
@@ -50,7 +52,7 @@ Stream_event *
 Grob_info::event_cause () const
 {
   SCM cause = grob_->get_property ("cause");
-  return Stream_event::unsmob (cause);
+  return unsmob<Stream_event> (cause);
 }
 
 vector<Context *>
@@ -90,11 +92,11 @@ Stream_event *
 Grob_info::ultimate_event_cause () const
 {
   SCM cause = grob_->self_scm ();
-  while (Grob::unsmob (cause))
+  while (unsmob<Grob> (cause))
     {
-      cause = Grob::unsmob (cause)->get_property ("cause");
+      cause = unsmob<Grob> (cause)->get_property ("cause");
     }
-  return Stream_event::unsmob (cause);
+  return unsmob<Stream_event> (cause);
 }
 
 bool