diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 11:10:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-06 09:21:24 +0000 |
| commit | 0ea05f930fb6811da33606cf546057e11a96361c (patch) | |
| tree | 555eecafc2f850c663180f3d516bcc74abae24e9 /vcl | |
| parent | fc5acf0f608ed279f719e38f9a6e80c326b93fa8 (diff) | |
drop various _MSC_VER < 1900 conditionals
Change-Id: I68d93b260db1f542bb3b44858b61b2d30ae93530
Reviewed-on: https://gerrit.libreoffice.org/34856
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 76039a35e09a..1969f016b4e0 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -818,21 +818,10 @@ namespace { } WatchdogTimings::WatchdogTimings() - : maTimingValues -#if defined _MSC_VER && _MSC_VER <= 1800 - // note: Apple clang's parser segfaults on this - ( -#else - // note: MSVC 2013 can't parse this, error C2797 - { -#endif + : maTimingValues{ {{6, 20} /* 1.5s, 5s */, {20, 120} /* 5s, 30s */, {60, 240} /* 15s, 60s */, {60, 240} /* 15s, 60s */} -#if defined _MSC_VER && _MSC_VER <= 1800 - ) -#else } -#endif , mbRelaxed(false) { } |