[Libreoffice-commits] core.git: vcl/source

[Michael Stahl]

 vcl/source/opengl/OpenGLHelper.cxx |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 41602324b00866b3c4f5f52759c8eb5ea8a1da0d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 23 20:17:42 2016 +0200

    vcl: C++11 is awesome, they said! it's a whole new language, they said!
    
    Change-Id: I96f00bd00ffcfea8ca026aacbaacf9539e327eff

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 503f4f1..e498597 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)
 {
 }