From 0a9666c97074cc33089c58f2fdec35a55fc5ac16 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Wed, 13 Nov 2013 01:23:37 +0100 Subject: fix C++11 build on Windows, now build finishes without errors with TDM-GCC 4.6.1 (bzr r12806) --- src/display/nr-filter-turbulence.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') 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,10 +284,14 @@ 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; -- cgit v1.2.3