From e30be4212a631189bdfb68e3a72e2f80ae0a6f75 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 21 Feb 2016 08:27:05 -0800 Subject: [PATCH 395/398] WaE buggy warning in vs2015-r1 http://stackoverflow.com/questions/34013930/error-c4592-symbol-will-be-dynamically-initialized-vs2015-1-static-const-std Change-Id: Icbe882ad237d1e4f105006d8821ed5c89b06f525 Reviewed-on: https://gerrit.libreoffice.org/22601 Reviewed-by: Michael Stahl Tested-by: Michael Stahl (cherry picked from commit e895f1979ebf82cbab9739356ce97fc937efbdd0) Signed-off-by: Michael Stahl (cherry picked from commit c344820237efee7c3c7309a9f30ff8739aa8b5b4) --- desktop/source/lib/init.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 9e5c52917eb7..184d7772ffc9 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -186,6 +186,10 @@ static const ExtensionMap aDrawExtensionMap[] = * by css, it might turn out to be worth mapping some of these missing cursors * to available cursors? */ +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning( disable : 4592) +#endif static const std::map aPointerMap { { PointerStyle::Arrow, "default" }, // PointerStyle::Null ? @@ -228,6 +232,9 @@ static const std::map aPointerMap { // Pivot Delete, TabSelectS through TabSelectSW // PaintBrush, HideWhiteSpace, ShowWhiteSpace }; +#ifdef _MSC_VER +#pragma warning(pop) +#endif static OUString getUString(const char* pString) { -- 2.12.0