mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE buggy warning in vs2015-r1

Browse Source 
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>
This commit is contained in:
Norbert Thiebaud
2016-02-21 08:27:05 -08:00
committed by Michael Stahl
parent 5cbf2c1189
commit e895f1979e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
desktop/source/lib/init.cxx
View File

@@ -179,6 +179,10 @@ static const ExtensionMap aDrawExtensionMap[] =
* by css, it might turn out to be worth mapping some of these missing cursors * by css, it might turn out to be worth mapping some of these missing cursors
* to available cursors? * to available cursors?
*/ */
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning( disable : 4592)
#endif
static const std::map <PointerStyle, OString> aPointerMap { static const std::map <PointerStyle, OString> aPointerMap {
{ PointerStyle::Arrow, "default" }, { PointerStyle::Arrow, "default" },
// PointerStyle::Null ? // PointerStyle::Null ?
@@ -222,6 +226,9 @@ static const std::map <PointerStyle, OString> aPointerMap {
// Pivot Delete, TabSelectS through TabSelectSW // Pivot Delete, TabSelectS through TabSelectSW
// PaintBrush, HideWhiteSpace, ShowWhiteSpace // PaintBrush, HideWhiteSpace, ShowWhiteSpace
}; };
#ifdef _MSC_VER
#pragma warning(pop)
#endif
static OUString getUString(const char* pString) static OUString getUString(const char* pString)
{ {