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

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

diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 77c1a634eaa48219b74d7ee80e0e69c6303eb6f3..bcdb1250986e1572b4fa09493b68a7b773f88687 100644 (file)
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014  Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--2015  Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,9 +31,15 @@
   Property_object. Page-breaking handles Property_object objects.
 */
 
-class Prob
+class Prob : public Smob<Prob>
 {
-  DECLARE_SMOBS (Prob);
+public:
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  static SCM equal_p (SCM, SCM);
+  static const char type_p_name_[];
+  virtual ~Prob ();
+private:
   DECLARE_CLASSNAME (Prob);
 
   void init_vars ();
@@ -49,7 +55,7 @@ protected:
 public:
   Prob (SCM, SCM);
   Prob (Prob const &);
-  virtual string name () const;
+  virtual std::string name () const;
   SCM type () const { return type_; }
   SCM get_property_alist (bool _mutable) const;
   SCM internal_get_property (SCM sym) const;
@@ -57,7 +63,6 @@ public:
   void internal_set_property (SCM sym, SCM val);
 };
 
-DECLARE_UNSMOB (Prob, prob);
 
 SCM ly_prob_set_property_x (SCM system, SCM sym, SCM value);
 SCM ly_prob_property (SCM prob, SCM sym, SCM val);