diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2020-04-10 12:34:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-04-10 13:58:00 +0200 |
| commit | 28a9c4dc05646f32883387bd071ac79e853044d5 (patch) | |
| tree | fe093b7de0ace4b13a8cfea83710acac8225f61f /net/ServerSocket.hpp | |
| parent | bc9f0579e3d78bbe9bcd92e769b9cfcf6698e650 (diff) | |
Poll - cleanup method naming, and fix merge issues.
This mends several problems from commit
5710c8632383e92372e1d81b6e26acc975e25ec4.
Change-Id: I1b29f29ca81679608a2692488fa1ef22b2e62dfd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92032
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'net/ServerSocket.hpp')
| -rw-r--r-- | net/ServerSocket.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ServerSocket.hpp b/net/ServerSocket.hpp index 65f826913..5316d3318 100644 --- a/net/ServerSocket.hpp +++ b/net/ServerSocket.hpp @@ -65,8 +65,8 @@ public: /// Returns a valid Socket shared_ptr on success only. virtual std::shared_ptr<Socket> accept(); - int pgetPollEvents(std::chrono::steady_clock::time_point /* now */, - int64_t & /* timeoutMaxMicroS */) override + int getPollEvents(std::chrono::steady_clock::time_point /* now */, + int64_t & /* timeoutMaxMicroS */) override { return POLLIN; } |