summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx17
1 files changed, 15 insertions, 2 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 503f4f19b250..e49859793a64 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -818,8 +818,21 @@ namespace {
}
WatchdogTimings::WatchdogTimings()
- : maTimingValues{{{6, 20} /* 1.5s, 5s */, {20, 120} /* 5s, 30s */,
- {60, 240} /* 15s, 60s */, {60, 240} /* 15s, 60s */}}
+ : maTimingValues
+#ifdef _MSC_VER
+ // note: Apple clang's parser segfaults on this
+ (
+#else
+ // note: MSVC 2013 can't parse this, error C2797
+ {
+#endif
+ {{6, 20} /* 1.5s, 5s */, {20, 120} /* 5s, 30s */,
+ {60, 240} /* 15s, 60s */, {60, 240} /* 15s, 60s */}
+#ifdef _MSC_VER
+ )
+#else
+ }
+#endif
, mbRelaxed(false)
{
}