[Libreoffice-commits] online.git: net/Socket.hpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Mar 13 04:25:39 UTC 2017


 net/Socket.hpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 94051f21b5ebbbc5c410842df8a302f2e2ff0832
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Mar 12 22:30:30 2017 -0400

    wsd: SocketPoll::startThread can be protected
    
    Change-Id: Idd17f7314ac181e9a412e05a1287e15edf5047d2
    Reviewed-on: https://gerrit.libreoffice.org/35125
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 01f985c..5cced5f 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -252,9 +252,6 @@ public:
     /// Default poll time - useful to increase for debugging.
     static int DefaultPollTimeoutMs;
 
-    /// Start the polling thread (if desired)
-    void startThread();
-
     /// Stop the polling thread.
     void stop()
     {
@@ -438,8 +435,11 @@ public:
 
     const std::string& name() const { return _name; }
 
-private:
+protected:
+    /// Start the polling thread (if desired)
+    void startThread();
 
+private:
     /// Initialize the poll fds array with the right events
     void setupPollFds(Poco::Timestamp &timeout)
     {


More information about the Libreoffice-commits mailing list