X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=47e76718db2bd13e6e1c9236bf27df5ab10ef173;hb=616820eb02249fe731df7a5dabf975a108fa2970;hp=cffc4512c875acd4b3ab8e07985d16ee1b34cb8b;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index cffc4512c8..47e76718db 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -20,6 +20,7 @@
 #include "global-context.hh"
 
 #include <cstdio>
+using namespace std;
 
 #include "context-def.hh"
 #include "dispatcher.hh"
@@ -29,7 +30,11 @@
 #include "output-def.hh"
 #include "warn.hh"
 
-using std::string;
+void
+Global_context::pre_init ()
+{
+  output_def_ = 0;
+}
 
 Global_context::Global_context (Output_def *o)
   : Context ()
@@ -57,6 +62,13 @@ Global_context::Global_context (Output_def *o)
   accepts_list_ = scm_list_1 (default_child_);
 }
 
+void
+Global_context::derived_mark () const
+{
+  if (output_def_)
+    scm_gc_mark (output_def_->self_scm ());
+}
+
 Output_def *
 Global_context::get_output_def () const
 {