test

[lilypond.git] / lily / music-constructor.cc

diff --git a/lily/music-constructor.cc b/lily/music-constructor.cc
index bd14326605244fe83fa218f1a771b58e4c709605..51a2497ec6f95e9752418d1d8f16e280e6659084 100644 (file)
--- a/lily/music-constructor.cc
+++ b/lily/music-constructor.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,13 +11,13 @@
 #include "music-constructor.hh"
 typedef Music* (*Music_ctor) ();
 
-static map<String,Music_ctor> *ctors_map_;
+static std::map<String,Music_ctor> *ctors_map_;
 
 void
 add_music_ctor (String s,  Music_ctor c)
 {
   if (!ctors_map_)
-    ctors_map_ = new map<String, Music_ctor>;
+    ctors_map_ = new std::map<String, Music_ctor>;
   
  (*ctors_map_)[s] = c;
 }
@@ -33,8 +33,8 @@ get_music_ctor (String s)
 }
 
 Music* 
-get_music (String s)
+make_music (String s)
 {
-  return (*get_music_ctor (s)) ();
+  return (*get_music_ctor (s)) () ;
 }