[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/socket.hpp
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Sat Feb 18 00:41:30 UTC 2017
net/socket.hpp | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 34454d04c981c28303475edf26d65086fc6a297b
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Fri Feb 17 12:52:48 2017 -0500
nb: no redundant visibility
Change-Id: I8ad303f534ca8c953e4bf42d252c38fb2561f505
Reviewed-on: https://gerrit.libreoffice.org/34388
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 0f8345a..5332456 100644
--- a/net/socket.hpp
+++ b/net/socket.hpp
@@ -287,11 +287,6 @@ public:
{
}
- protected:
- std::vector< char > _inBuffer;
- std::vector< char > _outBuffer;
- public:
-
HandleResult handlePoll( int events ) override
{
bool closeSocket = false;
@@ -333,6 +328,9 @@ protected:
Socket(fd)
{
}
+
+ std::vector< char > _inBuffer;
+ std::vector< char > _outBuffer;
};
/// A plain, non-blocking, data streaming socket.
@@ -344,8 +342,6 @@ public:
{
}
- public:
-
bool readIncomingData() override
{
ssize_t len;
@@ -397,8 +393,6 @@ public:
{
}
- public:
-
bool readIncomingData() override
{
//TODO:
More information about the Libreoffice-commits
mailing list