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

[lilypond.git] / lily / include / grob.hh

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index db51e02e73cb0a0c5ec6ce1f4e91d56d5bc69bbe..5dda5112b22eef285dd3a12a3e1111e5cd13a382 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -102,7 +102,7 @@ public:
   bool is_live () const;
 
   /* naming. */
-  string name () const;
+  std::string name () const;
 
   /* Properties */
   SCM get_property_alist_chain (SCM) const;
@@ -118,8 +118,8 @@ public:
   void internal_set_property (SCM sym, SCM val);
 
   /* messages */
-  void warning (const string&) const;
-  void programming_error (const string&) const;
+  void warning (const std::string&) const;
+  void programming_error (const std::string&) const;
 
   /* class hierarchy */
   virtual System *get_system () const;
@@ -181,12 +181,12 @@ inline bool has_interface(Grob *g)
 }
 
 /* unification */
-void uniquify (vector <Grob *> &);
+void uniquify (std::vector <Grob *> &);
 
 /* refpoints */
 Grob *common_refpoint_of_list (SCM elt_list, Grob *, Axis a);
-Grob *common_refpoint_of_array (vector<Grob *> const &, Grob *, Axis a);
-Grob *common_refpoint_of_array (set<Grob *> const &, Grob *, Axis a);
+Grob *common_refpoint_of_array (std::vector<Grob *> const &, Grob *, Axis a);
+Grob *common_refpoint_of_array (std::set<Grob *> const &, Grob *, Axis a);
 System *get_root_system (Grob *me);
 
 /* extents */