[Libreoffice-commits] online.git: wsd/TileCache.cpp

[Libreoffice Gerrit user]

 wsd/TileCache.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0e9f5eba96ed1d83327002c4004843f38c425fe5
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Sep 3 18:58:43 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Sep 4 12:04:07 2018 +0300

    Make this file compile for iOS
    
    Note that I don't claim this file would make much sense for iOS as
    such at the moment. I just want it to compile for now. This holds for
    all my other recent commits with the same 'Make this file compile for
    iOS' commit message.

diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index c7743a5cc..5f995b30d 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -72,7 +72,7 @@ TileCache::TileCache(const std::string& docURL,
 
 TileCache::~TileCache()
 {
-    _owner = std::thread::id(0);
+    _owner = std::thread::id();
     LOG_INF("~TileCache dtor for uri [" << _docURL << "].");
 }
 
@@ -574,7 +574,7 @@ std::string TileCache::cancelTiles(const std::shared_ptr<ClientSession> &subscri
 
 void TileCache::assertCorrectThread()
 {
-    const bool correctThread = _owner == std::thread::id(0) || std::this_thread::get_id() == _owner;
+    const bool correctThread = _owner == std::thread::id() || std::this_thread::get_id() == _owner;
     if (!correctThread)
         LOG_ERR("TileCache method invoked from foreign thread. Expected: " <<
                 Log::to_string(_owner) << " but called from " <<