diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2013-03-28 17:19:46 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-01 15:45:16 -0700 |
| commit | 40738eaf638fd252d74765706f2f27419434f5f0 (patch) | |
| tree | f7d914d5352fab32594a1a2f4c384c70b8c7c723 | |
| parent | dc0af953d402a10a69d89730cfd66bea519c7312 (diff) | |
bug fixes for ControlPort
| -rw-r--r-- | gnuradio-runtime/include/rpcserver_ice.h | 8 | ||||
| -rw-r--r-- | gnuradio-runtime/swig/CMakeLists.txt | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gnuradio-runtime/include/rpcserver_ice.h b/gnuradio-runtime/include/rpcserver_ice.h index 198e565978..2c08f57dc7 100644 --- a/gnuradio-runtime/include/rpcserver_ice.h +++ b/gnuradio-runtime/include/rpcserver_ice.h @@ -26,6 +26,7 @@ #include <rpcserver_base.h> #include <rpcpmtconverters_ice.h> #include <string> +#include <sstream> #include <map> #include <gnuradio.h> #include <Ice/Exception.h> @@ -110,9 +111,10 @@ private: } } else { - std::cout << "Ctrlport Key called with unregistered key (" << p << ")\n"; - std::string tmpkey(p); - throw IceUtil::NullHandleException((boost::format("%s Ctrlport Key called with unregistered key = %s")%__FILE__%p).str().c_str(), __LINE__); + std::stringstream ss; + ss << "Ctrlport Key called with unregistered key (" << p << ")\n"; + std::cout << ss.str(); + throw IceUtil::IllegalArgumentException(__FILE__,__LINE__,ss.str().c_str()); } } diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt index cccb9a5741..7e3312bbf5 100644 --- a/gnuradio-runtime/swig/CMakeLists.txt +++ b/gnuradio-runtime/swig/CMakeLists.txt @@ -46,6 +46,7 @@ if(ENABLE_GR_LOG) endif(ENABLE_GR_LOG) if(ENABLE_GR_CTRLPORT) + ADD_DEFINITIONS(-DGR_CTRLPORT) list(APPEND GR_SWIG_FLAGS -DGR_CTRLPORT) list(APPEND GR_SWIG_LIBRARIES ${ICE_LIBRARIES}) list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR}) |