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

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

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 308f057242be5a10b7d124126cf51a4cfdfcc5ff..8fc60387bcaee89dec9fde986e04b0fa796f4e51 100644 (file)
--- a/lily/grob-array.cc
+++ b/lily/grob-array.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
   it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ Grob_array::array () const
 }
 
 SCM
-Grob_array::mark_smob ()
+Grob_array::mark_smob () const
 {
 #if 0  /* see System::derived_mark () const */
   for (vsize i = 0; i < grobs_.size (); i++)
@@ -62,7 +62,7 @@ Grob_array::mark_smob ()
 }
 
 int
-Grob_array::print_smob (SCM port, scm_print_state *)
+Grob_array::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Grob_array", port);
   for (vsize i = 0; i < size (); i++)
@@ -114,9 +114,9 @@ SCM
 grob_list_to_grob_array (SCM lst)
 {
   SCM arr_scm = Grob_array::make_array ();
-  Grob_array *ga = Grob_array::unsmob (arr_scm);
+  Grob_array *ga = unsmob<Grob_array> (arr_scm);
   for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
-    ga->add (Grob::unsmob (scm_car (s)));
+    ga->add (unsmob<Grob> (scm_car (s)));
   return arr_scm;
 }