diff options
| author | Markus Engel <markus.engel@tum.de> | 2014-03-24 20:44:06 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2014-03-24 20:44:06 +0000 |
| commit | ec202fae382ed65338732fc722e2eb902cd15d27 (patch) | |
| tree | 51248ef73985b4d83b70c59a2cae9d659f56bc6a | |
| parent | revert erroneously committed change from rev. 13198 (diff) | |
| download | inkscape-ec202fae382ed65338732fc722e2eb902cd15d27.tar.gz inkscape-ec202fae382ed65338732fc722e2eb902cd15d27.zip | |
Fix for in-class initialisation of double const value.
(bzr r13201)
| -rw-r--r-- | src/display/nr-filter-turbulence.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp index e63b335d2..a2a8c5756 100644 --- a/src/display/nr-filter-turbulence.cpp +++ b/src/display/nr-filter-turbulence.cpp @@ -288,7 +288,7 @@ private: static double constexpr PerlinOffset = 4096.0; #else #if (__cplusplus < 201103L) - static double const PerlinOffset = 4096.0; + static double const PerlinOffset; #else static double constexpr PerlinOffset = 4096.0; #endif @@ -309,6 +309,10 @@ private: bool _fractalnoise; }; +#if !defined(CPP11) && __cplusplus < 201103L + double const TurbulenceGenerator::PerlinOffset = 4096.0; +#endif + FilterTurbulence::FilterTurbulence() : gen(new TurbulenceGenerator()) , XbaseFrequency(0) |