*** empty log message ***

[lilypond.git] / lily / global-context.cc

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 8a534ef3ca670018ddafe70f0d88a5bc264e3380..df2f1f516096b91532a2dedb59e4e2adb45562d3 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -3,20 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "global-context.hh"
 
 #include <cstdio>
+using namespace std;
 
-#include "warn.hh"
-#include "music.hh"
-#include "music-iterator.hh"
-#include "score-context.hh"
 #include "context-def.hh"
-#include "output-def.hh"
+#include "international.hh"
 #include "lilypond-key.hh"
+#include "music-iterator.hh"
+#include "music.hh"
+#include "output-def.hh"
+#include "score-context.hh"
+#include "warn.hh"
 
 Global_context::Global_context (Output_def *o, Moment final, Object_key *key)
   : Context (new Lilypond_context_key (key,
@@ -29,9 +31,7 @@ Global_context::Global_context (Output_def *o, Moment final, Object_key *key)
 
   Context_def *globaldef = unsmob_context_def (definition_);
   if (!globaldef)
-    {
-      programming_error ("no `Global' context found");
-    }
+    programming_error ("no `Global' context found");
   else
     globaldef->apply_default_property_operations (this);
   accepts_list_ = scm_list_1 (ly_symbol2scm ("Score"));
@@ -52,7 +52,7 @@ Global_context::add_moment_to_process (Moment m)
   if (m < now_mom_)
     programming_error ("trying to freeze in time");
 
-  for (int i = 0; i < extra_mom_pq_.size (); i++)
+  for (vsize i = 0; i < extra_mom_pq_.size (); i++)
     if (extra_mom_pq_[i] == m)
       return;
   extra_mom_pq_.insert (m);