[Libreoffice-commits] core.git: compilerplugins/clang ucb/source

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/toolslong.cxx        |    3 ++-
 ucb/source/ucp/webdav-neon/NeonSession.cxx |    5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 13c0326d237cb4860b121ceba8ecb04fe96ae479
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Oct 29 10:30:32 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Oct 29 16:27:26 2020 +0100

    ne_lock::timeout is of type long, so keep using that here
    
    ...partially reverting 4fbd63860500b2db76df4d5aedbe5e3aa31fac69 "switching long
    to a 64-bit type on 64-bit windows"
    
    Change-Id: I858630e5de76942a001ba619085ee07183df6ff6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104994
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/toolslong.cxx b/compilerplugins/clang/toolslong.cxx
index 32e94f8397e5..719b5b0caca5 100644
--- a/compilerplugins/clang/toolslong.cxx
+++ b/compilerplugins/clang/toolslong.cxx
@@ -125,7 +125,8 @@ void ToolsLong::run()
 
     StringRef fn(handler.getMainFileName());
     // sberg says this is fine
-    if (loplugin::isSamePathname(fn, SRCDIR "/pyuno/source/module/pyuno.cxx"))
+    if (loplugin::isSamePathname(fn, SRCDIR "/pyuno/source/module/pyuno.cxx")
+        || loplugin::isSamePathname(fn, SRCDIR "/ucb/source/ucp/webdav-neon/NeonSession.cxx"))
         return;
 
     TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 4e9012a990dc..b914f41cd903 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -34,7 +34,6 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <osl/time.h>
-#include <tools/long.hxx>
 #include <ne_socket.h>
 #include <ne_auth.h>
 #include <ne_redirect.h>
@@ -1569,7 +1568,7 @@ void NeonSession::LOCK( const OUString & inPath,
     }
 
     // Set the lock timeout
-    theLock->timeout = static_cast<tools::Long>(rLock.Timeout);
+    theLock->timeout = static_cast<long>(rLock.Timeout);
 
     // Set the lock owner
     OUString aValue;
@@ -1629,7 +1628,7 @@ bool NeonSession::LOCK( NeonLock * pLock,
     // save the current requested timeout, because ne_lock_refresh uses
     // pLock->timeout as an out parameter. This prevents a feedback-loop,
     // where we would request a shorter timeout on each refresh.
-    tools::Long timeout = pLock->timeout;
+    long timeout = pLock->timeout;
     const int theRetVal = ne_lock_refresh(m_pHttpSession, pLock);
     if (theRetVal == NE_OK)
     {