vcl/source/opengl/OpenGLHelper.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 84b279b856a708022481408a3d553e6b8565678b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Sep 26 10:00:06 2016 +0200
That syntax is fine with MSVC 2015 now
Change-Id: I83fee880e1248dd874f7f459aa670c74deda6a7d
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index ac7f99e..45f8f76 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
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
