X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-ctor.cc;h=dd340e9941fd327642c58e83d80ac71328d05cfb;hb=e1679a36d8dcf7535bd5e91b9fae3609bf37a0b6;hp=e8838acf4816a12c546768e327873882733aa9e9;hpb=07d4d05df6479d58c3c5152c07d7c86b94ee98b4;p=lilypond.git

diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc
index e8838acf48..dd340e9941 100644
--- a/lily/global-ctor.cc
+++ b/lily/global-ctor.cc
@@ -1,27 +1,28 @@
-/*   
-  global-ctor.cc --  implement global constructors
-  
+/*
+  global-ctor.cc -- implement global constructors
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "global-ctor.hh"
-#include "array.hh"
 
-static Array<Global_ctor> *ctor_global_static_arr_p_;
+#include "std-vector.hh"
+
+static vector<Global_ctor> *ctor_global_statics_;
 
 void
 add_constructor (Global_ctor c)
 {
-  if (!ctor_global_static_arr_p_)
-    ctor_global_static_arr_p_ = new Array<Global_ctor>;
-  ctor_global_static_arr_p_->push (c);
+  if (!ctor_global_statics_)
+    ctor_global_statics_ = new vector<Global_ctor>;
+  ctor_global_statics_->push_back (c);
 }
 
 void
 call_constructors ()
 {
-  for (int i=0; i < ctor_global_static_arr_p_->size (); i++)
-    (ctor_global_static_arr_p_->elem (i)) ();
+  for (vsize i = 0; i < ctor_global_statics_->size (); i++)
+    (ctor_global_statics_->at (i)) ();
 }