diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-02-21 08:12:27 -0800 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-22 17:22:36 +0100 |
| commit | ab11077b3d3570cd9a9897cc952f5b5a6c2cd000 (patch) | |
| tree | 5ed2d8cffc290f9a43ecc8dda166e27c6adcd07c | |
| parent | WaE vs2015: casting from int32 to pointer to to odbc idiosyncracies (diff) | |
| download | core-ab11077b3d3570cd9a9897cc952f5b5a6c2cd000.tar.gz core-ab11077b3d3570cd9a9897cc952f5b5a6c2cd000.zip | |
WaE vs2015 truncation of literal on static_cast
Change-Id: I63a89c50c653145ea49aa34e4e4dd554da66598f
Reviewed-on: https://gerrit.libreoffice.org/22597
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit 42f9b97dfb30b6ff9584319b15968b76bea37155)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | basic/source/comp/codegen.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index 4c202edf8bba..f652b858e85e 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; } }; |