Issue 4997/7: Use Preinit for Global_context, protect output definition

[lilypond.git] / lily / include / global-context.hh

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index 75b52c95ae01f9fd943e46ed65add4fd4615be99..fd6f1f92c010c578c03286da4f30e8e3b7951234 100644 (file)
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -23,15 +23,17 @@
 #include "context.hh"
 #include "pqueue.hh"
 
-class Global_context : public Context
+class Global_context : public Preinit<Global_context>, public Context
 {
   PQueue<Moment> extra_mom_pq_;
   Output_def *output_def_;
+  virtual void derived_mark () const;
 
   DECLARE_CLASSNAME (Global_context);
 
   friend class Output_def;
 public:
+  void pre_init ();
   Global_context (Output_def *);
   int get_moments_left () const;
   Moment sneaky_insert_extra_moment (Moment);