basic/source/comp/codegen.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 42f9b97dfb30b6ff9584319b15968b76bea37155
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sun Feb 21 08:12:27 2016 -0800
WaE vs2015 truncation of literal on static_cast
Change-Id: I63a89c50c653145ea49aa34e4e4dd554da66598f
Reviewed-on: https://gerrit.libreoffice.org/22597
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 3f8c986..e11236f 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -478,7 +478,14 @@ public:
T result = 0 ;
static const S max = std::numeric_limits< S >::max();
result = m_nNumOp0 + ( ( sizeof(S) + 1 ) * m_nNumSingleParams ) + ( ((
sizeof(S) * 2 )+ 1 ) * m_nNumDoubleParams );
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning( disable : 4309)
+#endif
return std::min(static_cast<T>(max), result);
+#ifdef _MSC_VER
+#pragma warning(push)
+#endif
}
virtual bool processParams() override { return false; }
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
