Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / include / skyline-pair.hh

diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 8712b66c429e937b1ef0402457612ebda8996c4c..f7946c1851d50123979a6dd2623e62b90609ae32 100644 (file)
--- a/lily/include/skyline-pair.hh
+++ b/lily/include/skyline-pair.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2008--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2008--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 class Skyline_pair : public Simple_smob<Skyline_pair>
 {
 public:
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
 private:
   Drul_array<Skyline> skylines_;