X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob.cc;h=8b14f73416a820ee325d2ea6ea80ae53db5b9ff6;hb=512b082a1c470d0315ae8c5f48da3b374a2de716;hp=367d1616a7b4aae73b48eb674876b9de4b24f61d;hpb=2f0c6eb19208485a86d3416db3f3640a1d54752a;p=lilypond.git diff --git a/lily/prob.cc b/lily/prob.cc index 367d1616a7..8b14f73416 100644 --- a/lily/prob.cc +++ b/lily/prob.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2012 Jan Nieuwenhuizen + Copyright (C) 2004--2014 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ Prob::equal_p (SCM sa, SCM sb) equality; e.g., that two probs are equal iff they can be distinguished by calls to ly:prob-property. */ - Prob *probs[2] = {unsmob_prob (sa), unsmob_prob (sb)}; + Prob *probs[2] = {Prob::unsmob (sa), Prob::unsmob (sb)}; SCM props[2][2]; int i; @@ -64,7 +64,7 @@ Prob::equal_p (SCM sa, SCM sb) SCM aval = scm_cdar (aprop); SCM bval = scm_cdar (bprop); if (scm_caar (aprop) != scm_caar (bprop) - || (!(unsmob_input (aval) && unsmob_input (bval)) + || (!(Input::unsmob (aval) && Input::unsmob (bval)) && !to_boolean (scm_equal_p (aval, bval)))) return SCM_BOOL_F;