Merge branch 'issue4032'

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

diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh
index 1ea2b38dc70d750b83268941ef42604b7874dd4c..31e2190bc21c22dbb08d458774c4982f8fecdb1d 100644 (file)
--- 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--2012 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
@@ -48,6 +48,8 @@ public:
   virtual Moment now_mom () const;
   virtual Context *get_default_interpreter (const string &context_id = "");
 
+  static Global_context *unsmob (SCM x);
+
   Moment previous_moment () const;
 protected:
   Moment prev_mom_;
@@ -55,6 +57,5 @@ protected:
 };
 
 SCM ly_format_output (SCM);
-Global_context *unsmob_global_context (SCM x);
 
 #endif // GLOBAL_CONTEXT_HH