release: 1.3.0

[lilypond.git] / lily / scope.cc

diff --git a/lily/scope.cc b/lily/scope.cc
index 2f8c56a3ed70a733c710f39f69d2349d4791d823..be98f18612c6064a533093459c4bf9fa43c8c0df 100644 (file)
--- a/lily/scope.cc
+++ b/lily/scope.cc
@@ -20,7 +20,7 @@ Scope::print () const
     {
       if (ai.val()->init_b_ == init_b)
        {
-         DOUT << ai.key() << "=";
+         DEBUG_OUT << ai.key() << "=";
          ai.val()->print ();
        }
     }
@@ -28,9 +28,9 @@ Scope::print () const
 
 Scope::~Scope ()
 {
-  for (Scope_iter       ai (*this); ai.ok(); ai++)
+  for (Scope_iter ai (*this); ai.ok(); ai++)
     {
-      DOUT << "deleting: " << ai.key() << '\n';
+      DEBUG_OUT << "deleting: " << ai.key() << '\n';
       delete ai.val ();
     }
 }
@@ -44,14 +44,15 @@ Scope::Scope (Scope const&s)
     }
 }
 
-unsigned int scm_hash (Protected_scm s)
+unsigned int ly_pscm_hash (Protected_scm s)
 {
-  return scm_ihashv (s, ~1u);
+  return ly_scm_hash (s);
 }
 
+
 Scope::Scope ()
 {
-  hash_func_ = scm_hash;
+  hash_func_ = ly_pscm_hash;
 }
 
 bool