diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2013-11-13 00:23:37 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2013-11-13 00:23:37 +0000 |
| commit | 0a9666c97074cc33089c58f2fdec35a55fc5ac16 (patch) | |
| tree | d279a9e3ecf999631fc04fea8d1fa8e86d46c4f7 /src | |
| parent | fix build, complementary to rev12804 (forgot to commit) (diff) | |
| download | inkscape-0a9666c97074cc33089c58f2fdec35a55fc5ac16.tar.gz inkscape-0a9666c97074cc33089c58f2fdec35a55fc5ac16.zip | |
fix C++11 build on Windows, now build finishes without errors with TDM-GCC 4.6.1
(bzr r12806)
Diffstat (limited to 'src')
| -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 333074f55..e63b335d2 100644 --- a/src/display/nr-filter-turbulence.cpp +++ b/src/display/nr-filter-turbulence.cpp @@ -284,11 +284,15 @@ private: static int const BSize = 0x100; static int const BMask = 0xff; -#if __cplusplus < 201103L +#ifdef CPP11 // GCC 4.6.1 (currently used on Windows) does not correctly set __cplusplus in C++11 mode, so configure with -DCPP11 to make this work in C++11 mode + static double constexpr PerlinOffset = 4096.0; +#else +#if (__cplusplus < 201103L) static double const PerlinOffset = 4096.0; #else static double constexpr PerlinOffset = 4096.0; #endif +#endif Geom::Rect _tile; Geom::Point _baseFreq; |