Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / include / unpure-pure-container.hh

diff --git a/lily/include/unpure-pure-container.hh b/lily/include/unpure-pure-container.hh
index 5db80adec116d936d736f9e2236719cb6e7ed3a8..7accff9a8843fcdb788595a8d7821fd86d80cd85 100644 (file)
--- a/lily/include/unpure-pure-container.hh
+++ b/lily/include/unpure-pure-container.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 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
@@ -26,7 +26,7 @@
 class Unpure_pure_container : public Smob2<Unpure_pure_container>
 {
 public:
-  static const char type_p_name_ [];
+  static const char * const type_p_name_;
   SCM unpure_part () const { return scm1 (); }
   // A container that has the same callback for both 'pure' and 'unpure' lookups
   // and which ignores the 'start' and 'end' columnns.
@@ -36,10 +36,10 @@ public:
   static SCM make_smob (SCM a, SCM b = SCM_UNDEFINED)
   {
     if (SCM_UNBNDP (b) && !ly_is_procedure (a))
-      return Smob2::make_smob (a, a);
-    return Smob2::make_smob (a, b);
+      return Smob2<Unpure_pure_container>::make_smob (a, a);
+    return Smob2<Unpure_pure_container>::make_smob (a, b);
   }
-  static int print_smob (SCM, SCM, scm_print_state *);
+  int print_smob (SCM, scm_print_state *) const;
 };
 
 #endif /* UNPURE_PURE_CONTAINER_HH */