diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-02-20 08:16:47 -0800 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-22 17:21:39 +0100 |
| commit | b05d721dbf0f97abff657d2a7d421f0c48654d7a (patch) | |
| tree | 71b04aaa377b3054608ff5e61e99c5ef51fc9486 /tools | |
| parent | b8673b597b9c7a083f7f71dacf7dee9a567316aa (diff) | |
WaE vs2015 bug, add a temporary warning disable
Microsoft say that the warning c4592 we get there in vs2015-r1 is a bug
on their side. Ignore it for now
Change-Id: I820840a50932e42371947cdc10d1e09278f744ca
Reviewed-on: https://gerrit.libreoffice.org/22593
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit 981a62f8511416e679a35cdb11195e2149d81138)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/inet/inetmsg.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index ab07afc5b1b2..68cc49c3a776 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -204,6 +204,11 @@ bool INetMIMEMessage::ParseDateField ( (rDateTime.GetHour() > 23) )); } +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning( disable : 4592) +#endif + static const std::map<InetMessageMime, const char*> ImplINetMIMEMessageHeaderData = { { InetMessageMime::VERSION, "MIME-Version"}, @@ -212,6 +217,10 @@ static const std::map<InetMessageMime, const char*> ImplINetMIMEMessageHeaderDat { InetMessageMime::CONTENT_TRANSFER_ENCODING, "Content-Transfer-Encoding"} }; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + INetMIMEMessage::INetMIMEMessage() : pParent(nullptr) { |