diff options
| -rw-r--r-- | gnuradio-runtime/lib/controlport/rpcmanager.cc | 3 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc index cd911a8fda..920ed27673 100644 --- a/gnuradio-runtime/lib/controlport/rpcmanager.cc +++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc @@ -11,6 +11,7 @@ #include <gnuradio/rpcmanager.h> #include <cassert> #include <iostream> +#include <memory> #include <stdexcept> rpcmanager::rpcmanager() { ; } @@ -31,7 +32,7 @@ rpcserver_booter_base* rpcmanager::get() void rpcmanager::register_booter(rpcserver_booter_base* booter) { if (make_aggregator && !aggregator_registered) { - aggregator.reset(new rpcserver_booter_aggregator()); + aggregator = std::make_unique<rpcserver_booter_aggregator>(); aggregator_registered = true; } diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc b/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc index 8a8cb54721..ffd2db6148 100644 --- a/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc +++ b/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc @@ -184,7 +184,7 @@ void rpcserver_thrift::getKnobs(GNURadio::KnobMap& _return, const GNURadio::KnobIDList& knobs) { boost::mutex::scoped_lock lock(d_callback_map_lock); - if (knobs.size() == 0) { + if (knobs.empty()) { std::for_each(d_getcallbackmap.begin(), d_getcallbackmap.end(), get_all_f<QueryCallbackMap_t::value_type, @@ -202,7 +202,7 @@ void rpcserver_thrift::getRe(GNURadio::KnobMap& _return, const GNURadio::KnobIDList& knobs) { boost::mutex::scoped_lock lock(d_callback_map_lock); - if (knobs.size() == 0) { + if (knobs.empty()) { std::for_each(d_getcallbackmap.begin(), d_getcallbackmap.end(), get_all_f<QueryCallbackMap_t::value_type, @@ -228,7 +228,7 @@ void rpcserver_thrift::properties(GNURadio::KnobPropMap& _return, const GNURadio::KnobIDList& knobs) { boost::mutex::scoped_lock lock(d_callback_map_lock); - if (knobs.size() == 0) { + if (knobs.empty()) { std::for_each( d_getcallbackmap.begin(), d_getcallbackmap.end(), |