diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-15 21:45:55 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-15 21:45:55 +0000 |
| commit | ec2f5449d635a301b82c84d5f1a031fef62b34af (patch) | |
| tree | 70be27a769645e9733b50192121ea4e577cc49fc /src/display | |
| parent | Update to trunk (diff) | |
| parent | fix typo in rev 12797 (diff) | |
| download | inkscape-ec2f5449d635a301b82c84d5f1a031fef62b34af.tar.gz inkscape-ec2f5449d635a301b82c84d5f1a031fef62b34af.zip | |
Update to trunk
(bzr r11950.1.200)
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; |