Issue 4997/1: Add Preinit class for early initialization

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

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index 46f9d5560d5d7f038b7cd3d31115ab4cd82d8ddf..b068e204c02e345d50bf2343def2e95a68941c27 100644 (file)
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -35,7 +35,7 @@ struct Context_def : public Smob<Context_def>
 {
   SCM mark_smob () const;
   int print_smob (SCM, scm_print_state *) const;
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
   virtual ~Context_def ();
 private:
   /*
@@ -65,13 +65,13 @@ public:
 
   VIRTUAL_COPY_CONSTRUCTOR (Context_def, Context_def);
 
-  std::vector<Context_def *> path_to_acceptable_context (SCM type_string,
+  vector<Context_def *> path_to_acceptable_context (SCM type_string,
                                                     Output_def *,
                                                     SCM) const;
-  std::vector<Context_def *> internal_path_to_acceptable_context (SCM type_string,
+  vector<Context_def *> internal_path_to_acceptable_context (SCM type_string,
                                                              Output_def *,
                                                              SCM,
-                                                             std::set<const Context_def *> *seen) const;
+                                                             set<const Context_def *> *seen) const;
   Context *instantiate (SCM extra_ops);
 
   SCM to_alist () const;