diff options
| author | Pierre Ossman <ossman@cendio.se> | 2018-05-29 16:46:19 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2018-05-29 16:50:55 +0200 |
| commit | fe2e5fca2135acec490dc7284cfbca86ebe2610b (patch) | |
| tree | 44b890e6ce88f735c47740a4640b34ce687066ad /win | |
| parent | cb99be55d818a73be7dea51a2de4c5c16d0439a9 (diff) | |
| parent | 39594b801dc041d40b1348bf2efcf6f64215cd60 (diff) | |
| download | tigervnc-fe2e5fca2135acec490dc7284cfbca86ebe2610b.tar.gz tigervnc-fe2e5fca2135acec490dc7284cfbca86ebe2610b.zip | |
Merge branch 'unix' of https://github.com/CendioOssman/tigervnc
Diffstat (limited to 'win')
| -rw-r--r-- | win/winvnc/ManagedListener.cxx | 8 | ||||
| -rw-r--r-- | win/winvnc/ManagedListener.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/win/winvnc/ManagedListener.cxx b/win/winvnc/ManagedListener.cxx index 9137238a..a8c6f25e 100644 --- a/win/winvnc/ManagedListener.cxx +++ b/win/winvnc/ManagedListener.cxx @@ -31,7 +31,7 @@ ManagedListener::ManagedListener(SocketManager* mgr) ManagedListener::~ManagedListener() { if (!sockets.empty()) { - std::list<network::TcpListener*>::iterator iter; + std::list<network::SocketListener*>::iterator iter; for (iter = sockets.begin(); iter != sockets.end(); ++iter) manager->remListener(*iter); sockets.clear(); @@ -62,7 +62,7 @@ void ManagedListener::setFilter(const char* filterStr) { delete filter; filter = new network::TcpFilter(filterStr); if (!sockets.empty() && !localOnly) { - std::list<network::TcpListener*>::iterator iter; + std::list<network::SocketListener*>::iterator iter; for (iter = sockets.begin(); iter != sockets.end(); ++iter) (*iter)->setFilter(filter); } @@ -80,7 +80,7 @@ bool ManagedListener::isListening() { } void ManagedListener::refresh() { - std::list<network::TcpListener*>::iterator iter; + std::list<network::SocketListener*>::iterator iter; if (!sockets.empty()) { for (iter = sockets.begin(); iter != sockets.end(); ++iter) manager->remListener(*iter); @@ -107,7 +107,7 @@ void ManagedListener::refresh() { for (iter = sockets.begin(); iter != sockets.end(); ++iter) manager->addListener(*iter, server, addrChangeNotifier); } catch (...) { - std::list<network::TcpListener*>::iterator iter2; + std::list<network::SocketListener*>::iterator iter2; for (iter2 = sockets.begin(); iter2 != iter; ++iter2) manager->remListener(*iter2); for (; iter2 != sockets.end(); ++iter2) diff --git a/win/winvnc/ManagedListener.h b/win/winvnc/ManagedListener.h index e8d3c892..39223c79 100644 --- a/win/winvnc/ManagedListener.h +++ b/win/winvnc/ManagedListener.h @@ -45,7 +45,7 @@ namespace winvnc { protected: void refresh(); - std::list<network::TcpListener*> sockets; + std::list<network::SocketListener*> sockets; network::TcpFilter* filter; rfb::win32::SocketManager* manager; rfb::win32::SocketManager::AddressChangeNotifier* addrChangeNotifier; |