diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-16 21:22:36 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-16 21:22:36 +0000 |
| commit | 8420f10fa1e70abe46a90978d28c16a6f3a8ea7b (patch) | |
| tree | 7902443eb1b06f8da5e3ff06db2090b392e96160 /src/display | |
| parent | fix error su_v tell to me (diff) | |
| parent | fix typo in rev 12797 (diff) | |
| download | inkscape-8420f10fa1e70abe46a90978d28c16a6f3a8ea7b.tar.gz inkscape-8420f10fa1e70abe46a90978d28c16a6f3a8ea7b.zip | |
fix error su_v tell to me
(bzr r12588.1.28)
Diffstat (limited to 'src/display')
| -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; |