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

[lilypond.git] / lily / include / smobs.tcc

diff --git a/lily/include/smobs.tcc b/lily/include/smobs.tcc
index 714289f47fcd8e83fa858f9b70e538188653e6db..dd815e59db2fea6cf6582f6895db6a25049b2f3c 100644 (file)
--- a/lily/include/smobs.tcc
+++ b/lily/include/smobs.tcc
@@ -24,8 +24,6 @@
 // included from smobs.hh, but other template expansion systems might
 // make it feasible to compile this only a single time.
 
-#include "lily-guile-macros.hh"
-#include "smobs.hh"
 #include <typeinfo>
 
 template <class Super>
@@ -113,7 +111,7 @@ template <class Super>
 Scm_init Smob_base<Super>::scm_init_ (init);
 
 template <class Super>
-string Smob_base<Super>::smob_name_;
+std::string Smob_base<Super>::smob_name_;
 
 template <class Super>
 void Smob_base<Super>::init ()
@@ -144,7 +142,7 @@ void Smob_base<Super>::init ()
     {
       SCM subr = scm_c_define_gsubr (Super::type_p_name_, 1, 0, 0,
                                      (scm_t_subr) smob_p);
-      string fundoc = string("Is @var{x} a @code{") + smob_name_
+      std::string fundoc = std::string("Is @var{x} a @code{") + smob_name_
         + "} object?";
       ly_add_function_documentation (subr, Super::type_p_name_, "(SCM x)",
                                      fundoc);