diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-26 10:00:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-26 10:00:06 +0200 |
| commit | 84b279b856a708022481408a3d553e6b8565678b (patch) | |
| tree | 21b9d184fed13c80575c7a85d39e3f74a0196a18 /vcl | |
| parent | 93160bcb2dce54bbccb5935cd0a71b52ad5e5461 (diff) | |
That syntax is fine with MSVC 2015 now
Change-Id: I83fee880e1248dd874f7f459aa670c74deda6a7d
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index ac7f99e9f0a1..45f8f7684df2 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -819,7 +819,7 @@ namespace { WatchdogTimings::WatchdogTimings() : maTimingValues -#ifdef _MSC_VER +#if defined _MSC_VER && _MSC_VER <= 1800 // note: Apple clang's parser segfaults on this ( #else @@ -828,7 +828,7 @@ WatchdogTimings::WatchdogTimings() #endif {{6, 20} /* 1.5s, 5s */, {20, 120} /* 5s, 30s */, {60, 240} /* 15s, 60s */, {60, 240} /* 15s, 60s */} -#ifdef _MSC_VER +#if defined _MSC_VER && _MSC_VER <= 1800 ) #else } |