diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-02-21 08:27:05 -0800 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-22 17:58:02 +0100 |
| commit | c344820237efee7c3c7309a9f30ff8739aa8b5b4 (patch) | |
| tree | 7fec294fcd04dae0ce0ffb93e7900a8a6a4ef7eb /desktop | |
| parent | 8425ac5c49d3844d04b3be3eddd841ce1902bf2c (diff) | |
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 <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e895f1979ebf82cbab9739356ce97fc937efbdd0)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b2d6e14d904d..7d0cbe999983 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -187,6 +187,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 <PointerStyle, OString> aPointerMap { { PointerStyle::Arrow, "default" }, // PointerStyle::Null ? @@ -229,6 +233,9 @@ static const std::map <PointerStyle, OString> aPointerMap { // Pivot Delete, TabSelectS through TabSelectSW // PaintBrush, HideWhiteSpace, ShowWhiteSpace }; +#ifdef _MSC_VER +#pragma warning(pop) +#endif static OUString getUString(const char* pString) { |