X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fglobal-context.hh;h=8c1b8b66ab73294cb5bd8aaef439cab1eee279bd;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=561cd6e49cc7012ea8d3dc66bbc988c59395a202;hpb=7f5363be4d24bb512d9c25dcd8c975ed87e4c923;p=lilypond.git

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index 561cd6e49c..8c1b8b66ab 100644
--- a/lily/include/global-context.hh
+++ b/lily/include/global-context.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,12 +23,12 @@
 #include "context.hh"
 #include "pqueue.hh"
 
-class Global_context : public virtual Context
+class Global_context : public Context
 {
   PQueue<Moment> extra_mom_pq_;
   Output_def *output_def_;
 
-  DECLARE_CLASSNAME(Global_context);
+  DECLARE_CLASSNAME (Global_context);
 
   friend class Output_def;
 public:
@@ -46,7 +46,7 @@ public:
   virtual SCM get_output ();
   virtual Output_def *get_output_def () const;
   virtual Moment now_mom () const;
-  virtual Context *get_default_interpreter (string context_id = "");
+  virtual Context *get_default_interpreter (const string &context_id = "");
 
   Moment previous_moment () const;
 protected: