Merge remote-tracking branch 'origin/release/unstable' into HEAD

[lilypond.git] / lily / protected-scm.cc

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 75091e19015ce3d78e87dd208be3fae1cf2b9f73..a9fabdc4f2e6fa69803b4c2aaa2c3583039d2154 100644 (file)
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -72,7 +72,9 @@ Protected_scm::operator = (Protected_scm const &s)
 
 Protected_scm::operator SCM const & () const
 {
-  return SCM_CONSP (object_) ? *SCM_CARLOC (object_) : object_;
+  if (SCM_CONSP (object_))
+    return *SCM_CARLOC (object_);
+  return object_;
 }
 
 Protected_scm::operator SCM & ()