Issue 5024: Rework the Preinit framework into something simpler

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

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index fd6f1f92c010c578c03286da4f30e8e3b7951234..e0aca0a7d6cc35aeea203bb3c524e985eedd80ba 100644 (file)
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -23,17 +23,21 @@
 #include "context.hh"
 #include "pqueue.hh"
 
-class Global_context : public Preinit<Global_context>, public Context
+struct Preinit_Global_context
 {
-  PQueue<Moment> extra_mom_pq_;
   Output_def *output_def_;
+  Preinit_Global_context ();
+};
+
+class Global_context : Preinit_Global_context, public Context
+{
+  PQueue<Moment> extra_mom_pq_;
   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);