Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 0b82c4629eb68912e2847366028d004e5c1eae91..839edd4abacdff4c1be17a8cabd93267d66ef271 100644 (file)
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2007  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef PROPERTY_OBJECT_HH
 #define PROPERTY_OBJECT_HH
 
 #include "stencil.hh"
+#include "virtual-methods.hh"
+
 
 /*
   A formatted "system" (A block of titling also is a Property_object)
@@ -20,7 +22,7 @@
 */
 class Prob
 {
-  DECLARE_SMOBS (Prob,);
+  DECLARE_SMOBS (Prob);
   DECLARE_CLASSNAME(Prob);
 
   void init_vars ();
@@ -40,12 +42,7 @@ public:
   SCM type () const { return type_; }
   SCM get_property_alist (bool mutble) const;
   SCM internal_get_property (SCM sym) const;
-
-#ifndef NDEBUG
-  void internal_set_property (SCM sym, SCM val, const char *file, int line, char const *fun);
-#else
   void internal_set_property (SCM sym, SCM val);
-#endif
 };
 DECLARE_UNSMOB(Prob,prob);
 SCM ly_prob_set_property_x (SCM system, SCM sym, SCM value);