diff options
| -rw-r--r-- | gnuradio-runtime/lib/block.cc | 282 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/top_block.cc | 12 | ||||
| -rw-r--r-- | gr-blocks/lib/ctrlport_probe2_b_impl.cc | 12 | ||||
| -rw-r--r-- | gr-blocks/lib/ctrlport_probe2_c_impl.cc | 12 | ||||
| -rw-r--r-- | gr-blocks/lib/ctrlport_probe2_f_impl.cc | 14 | ||||
| -rw-r--r-- | gr-blocks/lib/ctrlport_probe2_i_impl.cc | 14 | ||||
| -rw-r--r-- | gr-blocks/lib/ctrlport_probe2_s_impl.cc | 14 | ||||
| -rw-r--r-- | gr-blocks/lib/ctrlport_probe_c_impl.cc | 4 | ||||
| -rw-r--r-- | gr-blocks/lib/nop_impl.cc | 23 | ||||
| -rw-r--r-- | gr-blocks/lib/throttle_impl.cc | 8 | ||||
| -rw-r--r-- | gr-digital/lib/timing_error_detector.cc | 8 | ||||
| -rw-r--r-- | gr-fft/lib/ctrlport_probe_psd_impl.cc | 14 | ||||
| -rw-r--r-- | gr-qtgui/lib/edit_box_msg_impl.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/numberdisplayform.cc | 2 |
14 files changed, 206 insertions, 215 deletions
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc index a09409708e..5914283908 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc @@ -667,26 +667,26 @@ void block::setup_pc_rpc() d_pc_rpc_set = true; #if defined(GR_CTRLPORT) && defined(GR_PERFORMANCE_COUNTERS) #include <gnuradio/rpcregisterhelpers.h> - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_trigger<block>(alias(), "reset_perf_counters", &block::reset_perf_counters, "Reset the Performance Counters", - RPC_PRIVLVL_MIN))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, float>(alias(), - "noutput_items", - &block::pc_noutput_items, - pmt::mp(0), - pmt::mp(32768), - pmt::mp(0), - "", - "noutput items", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back(rpcbasic_sptr( + RPC_PRIVLVL_MIN)); + + d_rpc_vars.emplace_back( + new rpcbasic_register_get<block, float>(alias(), + "noutput_items", + &block::pc_noutput_items, + pmt::mp(0), + pmt::mp(32768), + pmt::mp(0), + "", + "noutput items", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back( new rpcbasic_register_get<block, float>(alias(), "avg noutput_items", &block::pc_noutput_items_avg, @@ -696,9 +696,9 @@ void block::setup_pc_rpc() "", "Average noutput items", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); + DISPTIME | DISPOPTSTRIP)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<block, float>(alias(), "var noutput_items", &block::pc_noutput_items_var, @@ -708,45 +708,45 @@ void block::setup_pc_rpc() "", "Var. noutput items", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, float>(alias(), - "nproduced", - &block::pc_nproduced, - pmt::mp(0), - pmt::mp(32768), - pmt::mp(0), - "", - "items produced", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, float>(alias(), - "avg nproduced", - &block::pc_nproduced_avg, - pmt::mp(0), - pmt::mp(32768), - pmt::mp(0), - "", - "Average items produced", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, float>(alias(), - "var nproduced", - &block::pc_nproduced_var, - pmt::mp(0), - pmt::mp(32768), - pmt::mp(0), - "", - "Var. items produced", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back(rpcbasic_sptr( + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back( + new rpcbasic_register_get<block, float>(alias(), + "nproduced", + &block::pc_nproduced, + pmt::mp(0), + pmt::mp(32768), + pmt::mp(0), + "", + "items produced", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back( + new rpcbasic_register_get<block, float>(alias(), + "avg nproduced", + &block::pc_nproduced_avg, + pmt::mp(0), + pmt::mp(32768), + pmt::mp(0), + "", + "Average items produced", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back( + new rpcbasic_register_get<block, float>(alias(), + "var nproduced", + &block::pc_nproduced_var, + pmt::mp(0), + pmt::mp(32768), + pmt::mp(0), + "", + "Var. items produced", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back( new rpcbasic_register_get<block, float>(alias(), "work time", &block::pc_work_time, @@ -756,9 +756,9 @@ void block::setup_pc_rpc() "", "clock cycles in call to work", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); + DISPTIME | DISPOPTSTRIP)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<block, float>(alias(), "avg work time", &block::pc_work_time_avg, @@ -768,9 +768,9 @@ void block::setup_pc_rpc() "", "Average clock cycles in call to work", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); + DISPTIME | DISPOPTSTRIP)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<block, float>(alias(), "var work time", &block::pc_work_time_var, @@ -780,9 +780,9 @@ void block::setup_pc_rpc() "", "Var. clock cycles in call to work", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); + DISPTIME | DISPOPTSTRIP)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<block, float>(alias(), "total work time", &block::pc_work_time_total, @@ -792,9 +792,9 @@ void block::setup_pc_rpc() "", "Total clock cycles in calls to work", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); + DISPTIME | DISPOPTSTRIP)); - d_rpc_vars.push_back(rpcbasic_sptr(new rpcbasic_register_get<block, float>( + d_rpc_vars.emplace_back(new rpcbasic_register_get<block, float>( alias(), "avg throughput", &block::pc_throughput_avg, @@ -804,85 +804,79 @@ void block::setup_pc_rpc() "items/s", "Average items throughput in call to work", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>( - alias(), - "input \% full", - &block::pc_input_buffers_full, - pmt::make_f32vector(0, 0), - pmt::make_f32vector(0, 1), - pmt::make_f32vector(0, 0), - "", - "how full input buffers are", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>( - alias(), - "avg input \% full", - &block::pc_input_buffers_full_avg, - pmt::make_f32vector(0, 0), - pmt::make_f32vector(0, 1), - pmt::make_f32vector(0, 0), - "", - "Average of how full input buffers are", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>( - alias(), - "var input \% full", - &block::pc_input_buffers_full_var, - pmt::make_f32vector(0, 0), - pmt::make_f32vector(0, 1), - pmt::make_f32vector(0, 0), - "", - "Var. of how full input buffers are", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>( - alias(), - "output \% full", - &block::pc_output_buffers_full, - pmt::make_f32vector(0, 0), - pmt::make_f32vector(0, 1), - pmt::make_f32vector(0, 0), - "", - "how full output buffers are", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>( - alias(), - "avg output \% full", - &block::pc_output_buffers_full_avg, - pmt::make_f32vector(0, 0), - pmt::make_f32vector(0, 1), - pmt::make_f32vector(0, 0), - "", - "Average of how full output buffers are", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); - - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<block, std::vector<float>>( - alias(), - "var output \% full", - &block::pc_output_buffers_full_var, - pmt::make_f32vector(0, 0), - pmt::make_f32vector(0, 1), - pmt::make_f32vector(0, 0), - "", - "Var. of how full output buffers are", - RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>( + alias(), + "input \% full", + &block::pc_input_buffers_full, + pmt::make_f32vector(0, 0), + pmt::make_f32vector(0, 1), + pmt::make_f32vector(0, 0), + "", + "how full input buffers are", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>( + alias(), + "avg input \% full", + &block::pc_input_buffers_full_avg, + pmt::make_f32vector(0, 0), + pmt::make_f32vector(0, 1), + pmt::make_f32vector(0, 0), + "", + "Average of how full input buffers are", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>( + alias(), + "var input \% full", + &block::pc_input_buffers_full_var, + pmt::make_f32vector(0, 0), + pmt::make_f32vector(0, 1), + pmt::make_f32vector(0, 0), + "", + "Var. of how full input buffers are", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>( + alias(), + "output \% full", + &block::pc_output_buffers_full, + pmt::make_f32vector(0, 0), + pmt::make_f32vector(0, 1), + pmt::make_f32vector(0, 0), + "", + "how full output buffers are", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>( + alias(), + "avg output \% full", + &block::pc_output_buffers_full_avg, + pmt::make_f32vector(0, 0), + pmt::make_f32vector(0, 1), + pmt::make_f32vector(0, 0), + "", + "Average of how full output buffers are", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); + + d_rpc_vars.emplace_back(new rpcbasic_register_get<block, std::vector<float>>( + alias(), + "var output \% full", + &block::pc_output_buffers_full_var, + pmt::make_f32vector(0, 0), + pmt::make_f32vector(0, 1), + pmt::make_f32vector(0, 0), + "", + "Var. of how full output buffers are", + RPC_PRIVLVL_MIN, + DISPTIME | DISPOPTSTRIP)); #endif /* defined(GR_CTRLPORT) && defined(GR_PERFORMANCE_COUNTERS) */ } diff --git a/gnuradio-runtime/lib/top_block.cc b/gnuradio-runtime/lib/top_block.cc index 92f4cb7786..7485124bac 100644 --- a/gnuradio-runtime/lib/top_block.cc +++ b/gnuradio-runtime/lib/top_block.cc @@ -109,14 +109,14 @@ void top_block::setup_rpc() return; // Triggers - d_rpc_vars.push_back(rpcbasic_sptr(new rpcbasic_register_trigger<top_block>( - alias(), "stop", &top_block::stop, "Stop the flowgraph", RPC_PRIVLVL_MIN))); + d_rpc_vars.emplace_back(new rpcbasic_register_trigger<top_block>( + alias(), "stop", &top_block::stop, "Stop the flowgraph", RPC_PRIVLVL_MIN)); - d_rpc_vars.push_back(rpcbasic_sptr(new rpcbasic_register_trigger<top_block>( - alias(), "lock", &top_block::lock, "Lock the flowgraph", RPC_PRIVLVL_MIN))); + d_rpc_vars.emplace_back(new rpcbasic_register_trigger<top_block>( + alias(), "lock", &top_block::lock, "Lock the flowgraph", RPC_PRIVLVL_MIN)); - d_rpc_vars.push_back(rpcbasic_sptr(new rpcbasic_register_trigger<top_block>( - alias(), "unlock", &top_block::unlock, "Unock the flowgraph", RPC_PRIVLVL_MIN))); + d_rpc_vars.emplace_back(new rpcbasic_register_trigger<top_block>( + alias(), "unlock", &top_block::unlock, "Unock the flowgraph", RPC_PRIVLVL_MIN)); // Getters add_rpc_variable(rpcbasic_sptr( diff --git a/gr-blocks/lib/ctrlport_probe2_b_impl.cc b/gr-blocks/lib/ctrlport_probe2_b_impl.cc index b5c9532658..7f92b3a31b 100644 --- a/gr-blocks/lib/ctrlport_probe2_b_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_b_impl.cc @@ -116,7 +116,7 @@ void ctrlport_probe2_b_impl::setup_rpc() { #ifdef GR_CTRLPORT int len = static_cast<int>(d_len); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe2_b, std::vector<signed char>>( alias(), d_id.c_str(), @@ -127,9 +127,9 @@ void ctrlport_probe2_b_impl::setup_rpc() "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, - d_disp_mask))); + d_disp_mask)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe2_b, int>(alias(), "length", &ctrlport_probe2_b::length, @@ -139,9 +139,9 @@ void ctrlport_probe2_b_impl::setup_rpc() "samples", "get vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_set<ctrlport_probe2_b, int>(alias(), "length", &ctrlport_probe2_b::set_length, @@ -151,7 +151,7 @@ void ctrlport_probe2_b_impl::setup_rpc() "samples", "set vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); #endif /* GR_CTRLPORT */ } diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.cc b/gr-blocks/lib/ctrlport_probe2_c_impl.cc index b1b8233f2d..1f72247492 100644 --- a/gr-blocks/lib/ctrlport_probe2_c_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_c_impl.cc @@ -116,7 +116,7 @@ void ctrlport_probe2_c_impl::setup_rpc() { #ifdef GR_CTRLPORT int len = static_cast<int>(d_len); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe2_c, std::vector<std::complex<float>>>( alias(), d_id.c_str(), @@ -127,9 +127,9 @@ void ctrlport_probe2_c_impl::setup_rpc() "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, - d_disp_mask | DISPOPTCPLX))); + d_disp_mask | DISPOPTCPLX)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe2_c, int>(alias(), "length", &ctrlport_probe2_c::length, @@ -139,9 +139,9 @@ void ctrlport_probe2_c_impl::setup_rpc() "samples", "get vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_set<ctrlport_probe2_c, int>(alias(), "length", &ctrlport_probe2_c::set_length, @@ -151,7 +151,7 @@ void ctrlport_probe2_c_impl::setup_rpc() "samples", "set vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); #endif /* GR_CTRLPORT */ } diff --git a/gr-blocks/lib/ctrlport_probe2_f_impl.cc b/gr-blocks/lib/ctrlport_probe2_f_impl.cc index d373c23770..d47516698f 100644 --- a/gr-blocks/lib/ctrlport_probe2_f_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_f_impl.cc @@ -116,8 +116,8 @@ void ctrlport_probe2_f_impl::setup_rpc() { #ifdef GR_CTRLPORT int len = static_cast<int>(d_len); - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_f, std::vector<float>>( + d_rpc_vars.emplace_back( + new rpcbasic_register_get<ctrlport_probe2_f, std::vector<float>>( alias(), d_id.c_str(), &ctrlport_probe2_f::get, @@ -130,9 +130,9 @@ void ctrlport_probe2_f_impl::setup_rpc() "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, - d_disp_mask))); + d_disp_mask)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe2_f, int>(alias(), "length", &ctrlport_probe2_f::length, @@ -142,9 +142,9 @@ void ctrlport_probe2_f_impl::setup_rpc() "samples", "get vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_set<ctrlport_probe2_f, int>(alias(), "length", &ctrlport_probe2_f::set_length, @@ -154,7 +154,7 @@ void ctrlport_probe2_f_impl::setup_rpc() "samples", "set vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); #endif /* GR_CTRLPORT */ } diff --git a/gr-blocks/lib/ctrlport_probe2_i_impl.cc b/gr-blocks/lib/ctrlport_probe2_i_impl.cc index d52f1762b0..10422f0744 100644 --- a/gr-blocks/lib/ctrlport_probe2_i_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_i_impl.cc @@ -115,8 +115,8 @@ void ctrlport_probe2_i_impl::setup_rpc() { #ifdef GR_CTRLPORT int len = static_cast<int>(d_len); - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_i, std::vector<int>>( + d_rpc_vars.emplace_back( + new rpcbasic_register_get<ctrlport_probe2_i, std::vector<int>>( alias(), d_id.c_str(), &ctrlport_probe2_i::get, @@ -126,9 +126,9 @@ void ctrlport_probe2_i_impl::setup_rpc() "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, - d_disp_mask))); + d_disp_mask)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe2_i, int>(alias(), "length", &ctrlport_probe2_i::length, @@ -138,9 +138,9 @@ void ctrlport_probe2_i_impl::setup_rpc() "samples", "get vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_set<ctrlport_probe2_i, int>(alias(), "length", &ctrlport_probe2_i::set_length, @@ -150,7 +150,7 @@ void ctrlport_probe2_i_impl::setup_rpc() "samples", "set vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); #endif /* GR_CTRLPORT */ } diff --git a/gr-blocks/lib/ctrlport_probe2_s_impl.cc b/gr-blocks/lib/ctrlport_probe2_s_impl.cc index 45ae21a839..7166bf1083 100644 --- a/gr-blocks/lib/ctrlport_probe2_s_impl.cc +++ b/gr-blocks/lib/ctrlport_probe2_s_impl.cc @@ -115,8 +115,8 @@ void ctrlport_probe2_s_impl::setup_rpc() { #ifdef GR_CTRLPORT int len = static_cast<int>(d_len); - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_s, std::vector<short>>( + d_rpc_vars.emplace_back( + new rpcbasic_register_get<ctrlport_probe2_s, std::vector<short>>( alias(), d_id.c_str(), &ctrlport_probe2_s::get, @@ -126,9 +126,9 @@ void ctrlport_probe2_s_impl::setup_rpc() "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, - d_disp_mask))); + d_disp_mask)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe2_s, int>(alias(), "length", &ctrlport_probe2_s::length, @@ -138,9 +138,9 @@ void ctrlport_probe2_s_impl::setup_rpc() "samples", "get vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_set<ctrlport_probe2_s, int>(alias(), "length", &ctrlport_probe2_s::set_length, @@ -150,7 +150,7 @@ void ctrlport_probe2_s_impl::setup_rpc() "samples", "set vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); #endif /* GR_CTRLPORT */ } diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.cc b/gr-blocks/lib/ctrlport_probe_c_impl.cc index a899917c98..951647d61c 100644 --- a/gr-blocks/lib/ctrlport_probe_c_impl.cc +++ b/gr-blocks/lib/ctrlport_probe_c_impl.cc @@ -81,7 +81,7 @@ int ctrlport_probe_c_impl::work(int noutput_items, void ctrlport_probe_c_impl::setup_rpc() { #ifdef GR_CTRLPORT - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe_c, std::vector<std::complex<float>>>( alias(), d_id.c_str(), @@ -92,7 +92,7 @@ void ctrlport_probe_c_impl::setup_rpc() "volts", d_desc.c_str(), RPC_PRIVLVL_MIN, - DISPXY | DISPOPTSCATTER))); + DISPXY | DISPOPTSCATTER)); #endif /* GR_CTRLPORT */ } diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc index f079886e03..db216d97a4 100644 --- a/gr-blocks/lib/nop_impl.cc +++ b/gr-blocks/lib/nop_impl.cc @@ -69,19 +69,18 @@ int nop_impl::general_work(int noutput_items, void nop_impl::setup_rpc() { #ifdef GR_CTRLPORT - d_rpc_vars.push_back( - rpcbasic_sptr(new rpcbasic_register_get<nop, int>(alias(), - "test", - &nop::ctrlport_test, - pmt::mp(-256), - pmt::mp(255), - pmt::mp(0), - "", - "Simple testing variable", - RPC_PRIVLVL_MIN, - DISPNULL))); + d_rpc_vars.emplace_back(new rpcbasic_register_get<nop, int>(alias(), + "test", + &nop::ctrlport_test, + pmt::mp(-256), + pmt::mp(255), + pmt::mp(0), + "", + "Simple testing variable", + RPC_PRIVLVL_MIN, + DISPNULL)); - d_rpc_vars.push_back( + d_rpc_vars.emplace_back( rpcbasic_sptr(new rpcbasic_register_set<nop, int>(alias(), "test", &nop::set_ctrlport_test, diff --git a/gr-blocks/lib/throttle_impl.cc b/gr-blocks/lib/throttle_impl.cc index c18d44522f..abc7a512d1 100644 --- a/gr-blocks/lib/throttle_impl.cc +++ b/gr-blocks/lib/throttle_impl.cc @@ -116,7 +116,7 @@ int throttle_impl::work(int noutput_items, void throttle_impl::setup_rpc() { #ifdef GR_CTRLPORT - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<throttle, double>(alias(), "sample_rate", &throttle::sample_rate, @@ -126,9 +126,9 @@ void throttle_impl::setup_rpc() "Hz", "Sample Rate", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); + DISPTIME | DISPOPTSTRIP)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_set<throttle, double>(alias(), "sample_rate", &throttle::set_sample_rate, @@ -138,7 +138,7 @@ void throttle_impl::setup_rpc() "Hz", "Sample Rate", RPC_PRIVLVL_MIN, - DISPTIME | DISPOPTSTRIP))); + DISPTIME | DISPOPTSTRIP)); #endif /* GR_CTRLPORT */ } diff --git a/gr-digital/lib/timing_error_detector.cc b/gr-digital/lib/timing_error_detector.cc index bb299ea915..18df35ec23 100644 --- a/gr-digital/lib/timing_error_detector.cc +++ b/gr-digital/lib/timing_error_detector.cc @@ -232,11 +232,9 @@ void timing_error_detector::sync_reset() d_input_derivative.assign(d_error_depth, gr_complex(0.0f, 0.0f)); if (d_constellation) { - std::deque<gr_complex>::iterator it; - d_decision.clear(); - for (it = d_input.begin(); it != d_input.end(); ++it) - d_decision.push_back(gr_complex(0.0f, 0.0f)); - // d_decision.push_back(slice(*it)); + d_decision.assign(d_input.size(), gr_complex(0.0f, 0.0f)); + // for (it = d_input.begin(); it != d_input.end(); ++it) + // d_decision.push_back(slice(*it)); } sync_reset_input_clock(); diff --git a/gr-fft/lib/ctrlport_probe_psd_impl.cc b/gr-fft/lib/ctrlport_probe_psd_impl.cc index cb172666c9..a52418b121 100644 --- a/gr-fft/lib/ctrlport_probe_psd_impl.cc +++ b/gr-fft/lib/ctrlport_probe_psd_impl.cc @@ -137,7 +137,7 @@ void ctrlport_probe_psd_impl::setup_rpc() { #ifdef GR_CTRLPORT int len = static_cast<int>(d_len); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe_psd, std::vector<std::complex<float>>>( alias(), d_id.c_str(), @@ -148,9 +148,9 @@ void ctrlport_probe_psd_impl::setup_rpc() "dB", d_desc.c_str(), RPC_PRIVLVL_MIN, - DISPXY | DISPOPTSCATTER))); + DISPXY | DISPOPTSCATTER)); - d_rpc_vars.push_back(rpcbasic_sptr( + d_rpc_vars.emplace_back( new rpcbasic_register_get<ctrlport_probe_psd, int>(alias(), "length", &ctrlport_probe_psd::length, @@ -160,13 +160,13 @@ void ctrlport_probe_psd_impl::setup_rpc() "samples", "get vector length", RPC_PRIVLVL_MIN, - DISPNULL))); + DISPNULL)); -// d_rpc_vars.push_back( -// rpcbasic_sptr(new rpcbasic_register_set<ctrlport_probe_psd, int>( +// d_rpc_vars.emplace_back( +// new rpcbasic_register_set<ctrlport_probe_psd, int>( // alias(), "length", &ctrlport_probe_psd::set_length, // pmt::mp(1), pmt::mp(10*len), pmt::mp(len), -// "samples", "set vector length", RPC_PRIVLVL_MIN, DISPNULL))); +// "samples", "set vector length", RPC_PRIVLVL_MIN, DISPNULL)); #endif /* GR_CTRLPORT */ } diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc index 4b38a59004..0339276276 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.cc +++ b/gr-qtgui/lib/edit_box_msg_impl.cc @@ -492,7 +492,7 @@ void edit_box_msg_impl::edit_finished() if (conv_ok) { if (even) { im = t; - xv.push_back(gr_complex(re, im)); + xv.emplace_back(re, im); even = false; } else { re = t; diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index f0ae16c7ae..9c027671bc 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -40,7 +40,7 @@ NumberDisplayForm::NumberDisplayForm(int nplots, gr::qtgui::graph_t type, QWidge d_min.push_back(+1e32); d_max.push_back(-1e32); d_label.push_back(new QLabel(QString("Data %1").arg(i))); - d_unit.push_back(""); + d_unit.emplace_back(""); d_factor.push_back(1); d_text_box.push_back(new QLabel(QString("0"))); |