diff options
| author | Heikki Tauriainen <g034737@welho.com> | 2016-07-23 12:48:11 +0300 |
|---|---|---|
| committer | David Kastrup <dak@gnu.org> | 2016-07-23 16:46:34 +0200 |
| commit | b280487b16134aaad7e284a6034f1a4eba3a5a99 (patch) | |
| tree | f2486bbf885075377685d0e24012d3d018beda4e | |
| parent | b0dce76daf27721ba157cd2ac5d7662d4c8d75f8 (diff) | |
4944: Do not initialize static constants in class body (fix FTBFS on GCC 6)
| -rw-r--r-- | lily/audio-item.cc | 6 | ||||
| -rw-r--r-- | 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 2c5d691656..8db787860f 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; +const Real Audio_span_dynamic::MINIMUM_VOLUME = 0.0; +const Real Audio_span_dynamic::MAXIMUM_VOLUME = 1.0; +const Real Audio_span_dynamic::DEFAULT_VOLUME = 90.0 / 127.0; 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 597fa6a812..614fdff16b 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 const Real MINIMUM_VOLUME; + static const Real MAXIMUM_VOLUME; + static const Real DEFAULT_VOLUME; private: Moment start_moment_; |