diff options
| -rw-r--r-- | compilerplugins/clang/toolslong.cxx | 1 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-curl/CurlSession.cxx | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/compilerplugins/clang/toolslong.cxx b/compilerplugins/clang/toolslong.cxx index fbf9ceb38773..9a762c99af76 100644 --- a/compilerplugins/clang/toolslong.cxx +++ b/compilerplugins/clang/toolslong.cxx @@ -156,6 +156,7 @@ void ToolsLong::run() || loplugin::isSamePathname(fn, SRCDIR "/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx") || loplugin::isSamePathname(fn, SRCDIR "/shell/source/win32/zipfile/zipfile.cxx") + || loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/webdav-curl/CurlSession.cxx") || loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/webdav-neon/NeonSession.cxx")) return; // these are places where the external API is actually "long" diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx index d075c67132c8..7cab4ca763ee 100644 --- a/ucb/source/ucp/webdav-curl/CurlSession.cxx +++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx @@ -124,7 +124,7 @@ struct CurlOption Type const Tag; union { void const* const pValue; - decltype(0L) const lValue; + long const lValue; curl_off_t const cValue; }; #if 0 @@ -145,8 +145,7 @@ struct CurlOption , pExceptionString(i_pExceptionString) { } - CurlOption(CURLoption const i_Option, decltype(0L) const i_Value, - char const* const i_pExceptionString) + CurlOption(CURLoption const i_Option, long const i_Value, char const* const i_pExceptionString) : Option(i_Option) , Tag(Type::Long) , lValue(i_Value) @@ -206,7 +205,7 @@ public: { rc = curl_easy_setopt(m_pCurl, it.Option, *pp); } - else if (decltype(0L) const * const pLong = ::std::get_if<long>(&it.Value)) + else if (long const * const pLong = ::std::get_if<long>(&it.Value)) { rc = curl_easy_setopt(m_pCurl, it.Option, *pLong); } @@ -264,7 +263,7 @@ public: { rc = curl_easy_setopt(m_pCurl, it.Option, nullptr); } - else if (decltype(0L) const * const pLong = ::std::get_if<long>(&it.Value)) + else if (long const * const pLong = ::std::get_if<long>(&it.Value)) { rc = curl_easy_setopt(m_pCurl, it.Option, 0L); } @@ -699,8 +698,7 @@ CurlSession::CurlSession(uno::Reference<uno::XComponentContext> const& xContext, assert(rc == CURLE_OK); // ANY is always available if (!m_Proxy.aName.isEmpty()) { - rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_PROXYPORT, - static_cast<decltype(0L)>(m_Proxy.nPort)); + rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_PROXYPORT, static_cast<long>(m_Proxy.nPort)); assert(rc == CURLE_OK); OString const utf8Proxy(OUStringToOString(m_Proxy.aName, RTL_TEXTENCODING_UTF8)); rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_PROXY, utf8Proxy.getStr()); |