diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 14:03:44 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 14:03:44 -0700 |
| commit | 527c21cb6a3b1b32610c4acf0bec8956ace2c5bf (patch) | |
| tree | 5fdb9e755f77d2493d8851f956b074c6f11cb8ce /gnuradio-runtime/lib/controlport/rpcserver_selector.cc | |
| parent | 7765798c48b9ec4b1cda43367e97eb778a8ad758 (diff) | |
| parent | b092142302bcf8c771ec68e61da7781eb406c86f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime/lib/controlport/rpcserver_selector.cc')
| -rw-r--r-- | gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc index 692f151958..8f3b4557c2 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc @@ -26,14 +26,23 @@ bool rpcmanager::make_aggregator(false); -#ifdef RPCSERVER_ICE +#ifdef GR_RPCSERVER_ENABLED +rpcmanager manager_instance; +#endif + +#ifdef GR_RPCSERVER_ICE #error TODO ICE #endif -#ifdef RPCSERVER_ERLANG +#ifdef GR_RPCSERVER_THRIFT +#include <gnuradio/rpcserver_booter_thrift.h> +rpcmanager::rpcserver_booter_register_helper<rpcserver_booter_thrift> boot_thrift; +#endif + +#ifdef GR_RPCSERVER_ERLANG #error TODO ERLANG #endif -#ifdef RPCSERVER_XMLRPC +#ifdef GR_RPCSERVER_XMLRPC #error TODO XMLRPC #endif |