[Libreoffice-commits] online.git: wsd/SenderQueue.hpp

[Andras Timar]

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

New commits:
commit e9a370176b513c32b918e3bef1e6490dc0704bf9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Dec 12 12:08:51 2016 +0100

    wsd: fix error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]

diff --git a/wsd/SenderQueue.hpp b/wsd/SenderQueue.hpp
index afd7d95..11b89ee 100644
--- a/wsd/SenderQueue.hpp
+++ b/wsd/SenderQueue.hpp
@@ -69,11 +69,11 @@ public:
 
         std::unique_lock<std::mutex> lock(_mutex);
         _queue.push_back(item);
-        const size_t size = _queue.size();
+        const size_t queuesize = _queue.size();
         lock.unlock();
 
         _cv.notify_one();
-        return size;
+        return queuesize;
     }
 
     bool waitDequeue(SendItem& item,