tools/source/inet/inetmsg.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 981a62f8511416e679a35cdb11195e2149d81138
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Feb 20 08:16:47 2016 -0800
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 <da...@ostrovsky.org>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 2967bad..c161f76 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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
