[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 38/46: zeromq: Don't call context close as
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 38/46: zeromq: Don't call context close as it is not available in zmq 2 |
Date: |
Fri, 16 May 2014 19:37:17 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 746737b4a9fc74bf4e86debdf35e67b8238da8b9
Author: Johannes Schmitz <address@hidden>
Date: Mon May 12 14:28:44 2014 +0200
zeromq: Don't call context close as it is not available in zmq 2
---
gr-zeromq/lib/pub_sink_impl.cc | 1 -
gr-zeromq/lib/pull_source_impl.cc | 1 -
gr-zeromq/lib/push_sink_impl.cc | 1 -
gr-zeromq/lib/rep_sink_impl.cc | 1 -
gr-zeromq/lib/req_source_impl.cc | 1 -
5 files changed, 5 deletions(-)
diff --git a/gr-zeromq/lib/pub_sink_impl.cc b/gr-zeromq/lib/pub_sink_impl.cc
index 2749ddf..9d387f9 100644
--- a/gr-zeromq/lib/pub_sink_impl.cc
+++ b/gr-zeromq/lib/pub_sink_impl.cc
@@ -53,7 +53,6 @@ namespace gr {
pub_sink_impl::~pub_sink_impl()
{
d_socket->close();
- d_context->close();
delete d_socket;
delete d_context;
}
diff --git a/gr-zeromq/lib/pull_source_impl.cc
b/gr-zeromq/lib/pull_source_impl.cc
index 83f59c5..479b15b 100644
--- a/gr-zeromq/lib/pull_source_impl.cc
+++ b/gr-zeromq/lib/pull_source_impl.cc
@@ -61,7 +61,6 @@ namespace gr {
pull_source_impl::~pull_source_impl()
{
d_socket->close();
- d_context->close();
delete d_socket;
delete d_context;
}
diff --git a/gr-zeromq/lib/push_sink_impl.cc b/gr-zeromq/lib/push_sink_impl.cc
index 0b74789..d949a7f 100644
--- a/gr-zeromq/lib/push_sink_impl.cc
+++ b/gr-zeromq/lib/push_sink_impl.cc
@@ -58,7 +58,6 @@ namespace gr {
push_sink_impl::~push_sink_impl()
{
d_socket->close();
- d_context->close();
delete d_socket;
delete d_context;
}
diff --git a/gr-zeromq/lib/rep_sink_impl.cc b/gr-zeromq/lib/rep_sink_impl.cc
index 181c6ba..a8fd588 100644
--- a/gr-zeromq/lib/rep_sink_impl.cc
+++ b/gr-zeromq/lib/rep_sink_impl.cc
@@ -58,7 +58,6 @@ namespace gr {
rep_sink_impl::~rep_sink_impl()
{
d_socket->close();
- d_context->close();
delete d_socket;
delete d_context;
}
diff --git a/gr-zeromq/lib/req_source_impl.cc b/gr-zeromq/lib/req_source_impl.cc
index 2e40a2e..54cd659 100644
--- a/gr-zeromq/lib/req_source_impl.cc
+++ b/gr-zeromq/lib/req_source_impl.cc
@@ -58,7 +58,6 @@ namespace gr {
req_source_impl::~req_source_impl()
{
d_socket->close();
- d_context->close();
delete d_socket;
delete d_context;
}
- [Commit-gnuradio] [gnuradio] 33/46: zeromq: Timeout needs to be in milliseconds for zmq 3.0, close sockets correctly, cleanup, (continued)
- [Commit-gnuradio] [gnuradio] 33/46: zeromq: Timeout needs to be in milliseconds for zmq 3.0, close sockets correctly, cleanup, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 24/46: zeromq: Fix doxygen and memcpy for vlen, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 28/46: zeromq: removed stray debug code and cleanup, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 32/46: zeromq: Add parameters to xml, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 27/46: Merge remote-tracking branch 'iohannez/vlen' into zeromq, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 34/46: zeromq: Remove ZMQ_NOBLOCK as we are using polling, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 29/46: zeromq: cleanup QA code, still needs have ZMQ_LINGER set to zero, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 26/46: zeromq: Add qa tests, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 31/46: zeromq: Add missing timeout and blocking parameters and polling, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 25/46: zeromq: Add grc examples, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 38/46: zeromq: Don't call context close as it is not available in zmq 2,
git <=
- [Commit-gnuradio] [gnuradio] 37/46: zeromq: Change the value of the poll timeout according to the zmq version. Must be in microseconds for version 2 and below and in milliseconds for version 3 and above., git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 35/46: zeromq: Add qa code, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 36/46: zeromq: Change string of test name, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 02/46: zeromq: initial surgery to add to master build, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 46/46: Merge branch 'zeromq', git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 40/46: zeromq: Remove blocking Add timeout in xml, fix doxygen, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 39/46: Add sub_source block and fix pub_sink, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 44/46: zeromq: updates to qa code to wait for completion and pass., git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 45/46: zeromq: add missing vlen parameter in ports, git, 2014/05/16
- [Commit-gnuradio] [gnuradio] 42/46: zeromq: fixing up QA code for vlen, git, 2014/05/16