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

[lilypond.git] / lily / pitch.cc

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 0fd75129476a7a1d889d751c504e290f22c30843..610e30480f5ebbaf34b8370c8e26f9acfa8fefb3 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -26,6 +26,8 @@
 
 #include <cmath>
 
+using std::string;
+
 Pitch::Pitch (int o, int n, Rational a)
 {
   notename_ = n;
@@ -221,13 +223,13 @@ Pitch::down_to (int notename)
 const char Pitch::type_p_name_[] = "ly:pitch?";
 
 SCM
-Pitch::mark_smob ()
+Pitch::mark_smob () const
 {
   return scale_->self_scm ();
 }
 
 int
-Pitch::print_smob (SCM port, scm_print_state *)
+Pitch::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Pitch ", port);
   scm_display (ly_string2scm (to_string ()), port);
@@ -252,8 +254,8 @@ MAKE_SCHEME_CALLBACK (Pitch, less_p, 2);
 SCM
 Pitch::less_p (SCM p1, SCM p2)
 {
-  Pitch *a = Pitch::unsmob (p1);
-  Pitch *b = Pitch::unsmob (p2);
+  Pitch *a = unsmob<Pitch> (p1);
+  Pitch *b = unsmob<Pitch> (p2);
 
   if (compare (*a, *b) < 0)
     return SCM_BOOL_T;