summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2016-02-20 08:16:47 -0800
committerNorbert Thiebaud <nthiebaud@gmail.com>2016-02-21 23:13:30 +0000
commit981a62f8511416e679a35cdb11195e2149d81138 (patch)
tree49e6d66c9089af8cc9aba4a0867c2537737eba28 /tools
parenteb4efbc15d25dd6d00c6b7ead02bdf197121623e (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>
Diffstat (limited to 'tools')
-rw-r--r--tools/source/inet/inetmsg.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 2967bad38c38..c161f76b85f4 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)
{