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

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

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index a6e3c3860afb4331c91dd7b1ac1aad0aea50c5f9..8ba72b3701cd22f897595fdadd9d43df143f4526 100644 (file)
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--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
@@ -36,8 +36,8 @@ class Pitch : public Simple_smob<Pitch>
 {
 public:
   static SCM equal_p (SCM, SCM);
-  static int print_smob (SCM, SCM, scm_print_state *);
-  SCM mark_smob ();
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
   static const char type_p_name_[];
 private:
   int octave_;
@@ -72,7 +72,7 @@ public:
   int rounded_semitone_pitch () const;
   int rounded_quartertone_pitch () const;
   Pitch negated () const;
-  string to_string () const;
+  std::string to_string () const;
 
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
 };