Replace C++ (in)equality checks with proper SCM syntax

[lilypond.git] / lily / context-scheme.cc

diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc
index c3822100af4b079301bef089ac0ce0f27bd9fe58..d4bd77296c70a078247f75ea8f66f4af20b1ca46 100644 (file)
--- a/lily/context-scheme.cc
+++ b/lily/context-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -102,8 +102,8 @@ LY_DEFINE (ly_context_property, "ly:context-property",
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   Context *t = Context::unsmob (context);
-  SCM result = t->internal_get_property (sym);
-  return def != SCM_UNDEFINED && scm_is_null (result) ? def : result;
+  SCM result = t->get_property (sym);
+  return !SCM_UNBNDP (def) && scm_is_null (result) ? def : result;
 }
 
 LY_DEFINE (ly_context_set_property_x, "ly:context-set-property!",