summaryrefslogtreecommitdiff
path: root/gr-blocks
diff options
context:
space:
mode:
Diffstat (limited to 'gr-blocks')
-rw-r--r--gr-blocks/lib/ctrlport_probe2_b_impl.cc12
-rw-r--r--gr-blocks/lib/ctrlport_probe2_c_impl.cc12
-rw-r--r--gr-blocks/lib/ctrlport_probe2_f_impl.cc14
-rw-r--r--gr-blocks/lib/ctrlport_probe2_i_impl.cc14
-rw-r--r--gr-blocks/lib/ctrlport_probe2_s_impl.cc14
-rw-r--r--gr-blocks/lib/ctrlport_probe_c_impl.cc4
-rw-r--r--gr-blocks/lib/nop_impl.cc23
-rw-r--r--gr-blocks/lib/throttle_impl.cc8
8 files changed, 50 insertions, 51 deletions
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 */
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 11:29:25 +0000