From 54aef120afc3857fe07971ce0a62cb21426890d0 Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Fri, 22 Jul 2016 15:32:46 +0200 Subject: [PATCH 2/2] Fix FTBFS with GCC 6. GCC 6 now defaults to -std=gnu++14 instead of -std=gnu++98. Since C++11, the constexpr keyword is needed when initializing a non-integral static data member in a class. --- lily/audio-item.cc | 6 +++--- lily/include/audio-item.hh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 2c5d691..c5b1f87 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -102,9 +102,9 @@ Audio_key::Audio_key (int acc, bool major) major_ = major; } -const Real Audio_span_dynamic::MINIMUM_VOLUME; -const Real Audio_span_dynamic::MAXIMUM_VOLUME; -const Real Audio_span_dynamic::DEFAULT_VOLUME; +constexpr Real Audio_span_dynamic::MINIMUM_VOLUME; +constexpr Real Audio_span_dynamic::MAXIMUM_VOLUME; +constexpr Real Audio_span_dynamic::DEFAULT_VOLUME; Audio_span_dynamic::Audio_span_dynamic (Moment mom, Real volume) : start_moment_ (mom), diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index 597fa6a..9a2eea0 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -48,9 +48,9 @@ private: class Audio_span_dynamic : public Audio_element { public: - static const Real MINIMUM_VOLUME = 0.0; - static const Real MAXIMUM_VOLUME = 1.0; - static const Real DEFAULT_VOLUME = 90.0 / 127.0; + static constexpr Real MINIMUM_VOLUME = 0.0; + static constexpr Real MAXIMUM_VOLUME = 1.0; + static constexpr Real DEFAULT_VOLUME = 90.0 / 127.0; private: Moment start_moment_; -- 2.7.4