release: 1.0.17

[lilypond.git] / lily / scope.cc

diff --git a/lily/scope.cc b/lily/scope.cc
index 5918dc92fd08f8313e42d4746114d91b3147eb88..7ff133cc285076329bf9b73364fef02fe928c488 100644 (file)
--- a/lily/scope.cc
+++ b/lily/scope.cc
@@ -8,7 +8,7 @@
  */
 
 #include "scope.hh"
-#include "assoc-iter.hh"
+#include "dictionary-iter.hh"
 #include "debug.hh"
 #include "identifier.hh"
 
@@ -16,7 +16,7 @@ void
 Scope::print () const
 {
   bool init_b = false;         // ugh
-  for (Assoc_iter<String,Identifier*> ai (*this);  ai.ok(); ai++)
+  for (Dictionary_iter<Identifier*> ai (*this);  ai.ok(); ai++)
     {
       if (ai.val()->init_b_ == init_b)
        {
@@ -28,7 +28,7 @@ Scope::print () const
 
 Scope::~Scope ()
 {
-  for (Assoc_iter<String,Identifier*>   ai (*this); ai.ok(); ai++)
+  for (Dictionary_iter<Identifier*>     ai (*this); ai.ok(); ai++)
     {
       DOUT << "deleting: " << ai.key() << '\n';
       delete ai.val ();
@@ -38,7 +38,7 @@ Scope::~Scope ()
 Scope::Scope (Scope const&s)
   : Dictionary<Identifier*> (s)
 {
-  for (Assoc_iter<String,Identifier*> ai (s); ai.ok(); ai++)
+  for (Dictionary_iter<Identifier*> ai (s); ai.ok(); ai++)
     {
       (*this)[ai.key ()] = ai.val ()->clone ();
     }