Kaydet (Commit) 7a42f396 authored tarafından Mike Kaganski's avatar Mike Kaganski

basic: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: I9e157f7b27eab831c5c15f6c22b9ffb20207b593
Reviewed-on: https://gerrit.libreoffice.org/48947Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst bca11ff0
......@@ -468,19 +468,13 @@ public:
virtual void end() override {}
S offset()
{
typedef decltype(T(1) + S(1)) larger_t; // type capable to hold both value ranges of T and S
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
return std::min<larger_t>(max, result);
}
virtual bool processParams() override { return false; }
virtual bool processParams() override { return false; }
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment