[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint' |
|
Date: |
Wed, 27 Jan 2016 21:14:38 +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 bdaafcc49e8c3e0d66b15ebc8a3ea20239334431
Merge: bb2ed47 6e482c5
Author: Johnathan Corgan <address@hidden>
Date: Wed Jan 27 13:04:44 2016 -0800
Merge branch 'maint'
gr-zeromq/grc/zeromq_pub_sink.xml | 20 ++-
gr-zeromq/grc/zeromq_pull_source.xml | 20 ++-
gr-zeromq/grc/zeromq_push_sink.xml | 20 ++-
gr-zeromq/grc/zeromq_rep_sink.xml | 20 ++-
gr-zeromq/grc/zeromq_req_source.xml | 20 ++-
gr-zeromq/grc/zeromq_sub_source.xml | 20 ++-
gr-zeromq/include/gnuradio/zeromq/pub_sink.h | 3 +-
gr-zeromq/include/gnuradio/zeromq/pull_source.h | 3 +-
gr-zeromq/include/gnuradio/zeromq/push_sink.h | 3 +-
gr-zeromq/include/gnuradio/zeromq/rep_sink.h | 3 +-
gr-zeromq/include/gnuradio/zeromq/req_source.h | 3 +-
gr-zeromq/include/gnuradio/zeromq/sub_source.h | 3 +-
gr-zeromq/lib/CMakeLists.txt | 1 +
gr-zeromq/lib/base_impl.cc | 198 ++++++++++++++++++++++++
gr-zeromq/lib/base_impl.h | 77 +++++++++
gr-zeromq/lib/pub_sink_impl.cc | 55 +------
gr-zeromq/lib/pub_sink_impl.h | 15 +-
gr-zeromq/lib/pull_source_impl.cc | 93 ++++-------
gr-zeromq/lib/pull_source_impl.h | 15 +-
gr-zeromq/lib/push_sink_impl.cc | 69 ++-------
gr-zeromq/lib/push_sink_impl.h | 15 +-
gr-zeromq/lib/rep_sink_impl.cc | 91 +++++------
gr-zeromq/lib/rep_sink_impl.h | 15 +-
gr-zeromq/lib/req_source_impl.cc | 107 ++++++-------
gr-zeromq/lib/req_source_impl.h | 18 +--
gr-zeromq/lib/sub_source_impl.cc | 94 ++++-------
gr-zeromq/lib/sub_source_impl.h | 23 +--
gr-zeromq/lib/tag_headers.cc | 96 +++++++-----
gr-zeromq/lib/tag_headers.h | 5 +-
29 files changed, 651 insertions(+), 474 deletions(-)