diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-23 13:11:03 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-23 13:11:03 -0700 |
| commit | 697e0a4e59e81472b2d9bb1475940f46fdbf89fb (patch) | |
| tree | c194af6239d77613432a6fdecfe3c9cfba56431d /gnuradio-runtime/lib/controlport | |
| parent | 49d36df28d26abcd80b31f5e470fb57b33e77c14 (diff) | |
| parent | 065b0add8523e2f85afa0848391174889d1b61a9 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/CMakeLists.txt
gr-atsc/swig/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/lib/controlport')
| -rw-r--r-- | gnuradio-runtime/lib/controlport/rpcmanager.cc | 5 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc index a67febe386..fee255498e 100644 --- a/gnuradio-runtime/lib/controlport/rpcmanager.cc +++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc @@ -24,11 +24,6 @@ #include <iostream> #include <stdexcept> -bool rpcmanager::booter_registered(false); -bool rpcmanager::aggregator_registered(false); -std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0); -std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0); - rpcmanager::rpcmanager() {;} rpcmanager::~rpcmanager() {;} diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc index 8f3b4557c2..fcba1ab524 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc @@ -25,6 +25,10 @@ #include <gnuradio/rpcserver_selector.h> bool rpcmanager::make_aggregator(false); +bool rpcmanager::booter_registered(false); +bool rpcmanager::aggregator_registered(false); +std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0); +std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0); #ifdef GR_RPCSERVER_ENABLED rpcmanager manager_instance; |