generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 03:20:11 +01:00
Code Issues Projects Releases Wiki Activity

fix cherry pick leftover

Browse Source
This commit is contained in:
Alex Fabijanic
2018-05-04 13:48:47 -05:00
parent 82c88a238c
commit 8f5455717e
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Net/include/Poco/Net/SocketConnector.h
View File

@@ -20,11 +20,8 @@
#include "Poco/Net/Net.h" #include "Poco/Net/Net.h"
#include "Poco/Net/SocketNotification.h" #include "Poco/Net/SocketNotification.h"
<<<<<<< HEAD
=======
#include "Poco/Net/SocketReactor.h" #include "Poco/Net/SocketReactor.h"
#include "Poco/Net/ParallelSocketAcceptor.h" #include "Poco/Net/ParallelSocketAcceptor.h"
>>>>>>> 0d7f39f... add PollSet::has/empty(); ParallelAcceptor: always use same reactor for a socket, if registered
#include "Poco/Net/SocketAddress.h" #include "Poco/Net/SocketAddress.h"
#include "Poco/Net/StreamSocket.h" #include "Poco/Net/StreamSocket.h"
#include "Poco/Observer.h" #include "Poco/Observer.h"