Imported Debian patch 2.12.3-1

[lilypond.git] / lily / prob.cc

diff --git a/lily/prob.cc b/lily/prob.cc
index 9c3b40d712640c79aad814c8ed24c3b85c889c25..53ce8f72be3e9ba257061a08ee71a4957cd15b90 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "prob.hh"
@@ -11,7 +11,7 @@
 #include "item.hh"
 #include "input.hh"
 #include "profile.hh"
-
+#include <cstring>
 #include "ly-smobs.icc"
 
 IMPLEMENT_SMOBS (Prob);
@@ -47,7 +47,7 @@ Prob::equal_p (SCM sa, SCM sb)
       SCM bprop = props[1][i];
 
       for (;
-          scm_is_pair (aprop) && scm_is_pair(bprop);
+          scm_is_pair (aprop) && scm_is_pair (bprop);
           aprop = scm_cdr (aprop), bprop = scm_cdr (bprop))
        {
          SCM aval = scm_cdar (aprop);
@@ -111,7 +111,7 @@ Prob::derived_mark () const
 SCM
 Prob::mark_smob (SCM smob)
 {
-  ASSERT_LIVE_IS_ALLOWED();
+  ASSERT_LIVE_IS_ALLOWED ();
   
   Prob *system = (Prob *) SCM_CELL_WORD_1 (smob);
   scm_gc_mark (system->mutable_property_alist_);
@@ -157,19 +157,16 @@ Prob::internal_get_property (SCM sym) const
   return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
 }
 
+/* We don't (yet) instrument probs */
 void
-Prob::internal_set_property (SCM sym, SCM val
-#ifndef NDEBUG
-                            , char const *file, int line, char const *fun
-#endif
-                            ) 
+Prob::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*)
 {
-#ifndef NDEBUG
-  (void) file;
-  (void) line;
-  (void) fun;
-#endif
+  internal_set_property (sym, val);
+}
 
+void
+Prob::internal_set_property (SCM sym, SCM val) 
+{
   if (do_internal_type_checking_global)
     type_check_assignment (sym, val);
   
@@ -177,10 +174,9 @@ Prob::internal_set_property (SCM sym, SCM val
 }
 
 void
-Prob::type_check_assignment (SCM sym, SCM val) const
+Prob::type_check_assignment (SCM, SCM) const
 {
-  (void) sym;
-  (void) val;
+  /* empty */
 }
 
 SCM