generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-15 03:21:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1670 from hintjens/master

Browse Source 
CI was broken by #54799c (reverted)
This commit is contained in:
Constantin Rack 2015-12-18 09:06:12 +01:00
commit b67cdcfd0b
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -143,7 +143,7 @@ builds/msvc/**/*.user
builds/msvc/**/*Debug
builds/msvc/**/*Release
builds/redhat/zeromq.spec
builds/qt-android/prefix/
builds/android/prefix/
packaging/nuget/*.nupkg
foreign/openpgm/*
!foreign/openpgm/*.tar.bz2

3
src/session_base.cpp
View File

@ -429,9 +429,6 @@ void zmq::session_base_t::engine_error (
if (zap_pipe)
zap_pipe->check_read ();
zmq_assert(socket);
socket->flush_commands();
}
void zmq::session_base_t::process_term (int linger_)

7
src/socket_base.cpp
View File

@ -1467,13 +1467,6 @@ void zmq::socket_base_t::check_destroy ()
}
}
void zmq::socket_base_t::flush_commands ()
{
ENTER_MUTEX();
process_commands (0, false);
EXIT_MUTEX();
}
void zmq::socket_base_t::read_activated (pipe_t *pipe_)
{
xread_activated (pipe_);

2
src/socket_base.hpp
View File

@ -109,8 +109,6 @@ namespace zmq
void out_event ();
void timer_event (int id_);
void flush_commands();
// i_pipe_events interface implementation.
void read_activated (pipe_t *pipe_);
void write_activated (pipe_t *pipe_);