[Libreoffice-commits] online.git: loolwsd/ChildSession.hpp loolwsd/LOOLKit.cpp
Pranav Kant
pranavk at collabora.co.uk
Mon Aug 29 12:49:31 UTC 2016
loolwsd/ChildSession.hpp | 4 ++--
loolwsd/LOOLKit.cpp | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f6217133f4a8b4a81ce6a4fc7f109cc854d6f431
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Mon Aug 29 17:22:06 2016 +0530
loolwsd: view ids - unsigned -> int
Change-Id: I4bc2aa109143dd4cfd88a49c1988b66ae134d647
diff --git a/loolwsd/ChildSession.hpp b/loolwsd/ChildSession.hpp
index 7bd5122..93fc820 100644
--- a/loolwsd/ChildSession.hpp
+++ b/loolwsd/ChildSession.hpp
@@ -41,7 +41,7 @@ public:
/// Get a list of all current view IDs.
virtual
- std::vector<unsigned> getViewIds() const = 0;
+ std::vector<int> getViewIds() const = 0;
/// Send message to all other sessions except 'sessionId'
virtual
@@ -68,7 +68,7 @@ public:
bool getStatus(const char *buffer, int length);
bool getPartPageRectangles(const char *buffer, int length);
- unsigned getViewId() const { return _viewId; }
+ int getViewId() const { return _viewId; }
void loKitCallback(const int nType, const std::string& rPayload);
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 0d249a7..39e98e7 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -379,7 +379,7 @@ public:
struct CallbackDescriptor
{
Document* const Doc;
- const unsigned ViewId;
+ const int ViewId;
};
public:
@@ -924,11 +924,11 @@ private:
}
}
- std::vector<unsigned> getViewIds() const override
+ std::vector<int> getViewIds() const override
{
std::unique_lock<std::mutex> lock(_mutex);
- std::vector<unsigned> v;
+ std::vector<int> v;
v.reserve(_connections.size());
for (const auto& connection : _connections)
{
@@ -976,7 +976,7 @@ private:
}
auto session = it->second->getSession();
- unsigned viewId = 0;
+ int viewId = 0;
if (!_loKitDocument)
{
@@ -1150,7 +1150,7 @@ private:
mutable std::mutex _mutex;
std::condition_variable _cvLoading;
std::atomic_size_t _isLoading;
- std::map<unsigned, std::unique_ptr<CallbackDescriptor>> _viewIdToCallbackDescr;
+ std::map<int, std::unique_ptr<CallbackDescriptor>> _viewIdToCallbackDescr;
std::map<unsigned, std::shared_ptr<Connection>> _connections;
Poco::Thread _callbackThread;
Poco::NotificationQueue _callbackQueue;
More information about the Libreoffice-commits
mailing list