summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-09-23 20:17:42 +0200
committerMichael Stahl <mstahl@redhat.com>2016-09-23 20:20:47 +0200
commit41602324b00866b3c4f5f52759c8eb5ea8a1da0d (patch)
treecf8f9432d90e950c8adf44421929b2e2a3b3fb8b
parent09a77ceaf64852fa3204c2d9221a293bb3820dae (diff)
vcl: C++11 is awesome, they said! it's a whole new language, they said!
Change-Id: I96f00bd00ffcfea8ca026aacbaacf9539e327eff
-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)
{
}