7 files changed, 15 insertions, 15 deletions
diff --git a/gr-uhd/lib/rfnoc_block_generic_impl.cc b/gr-uhd/lib/rfnoc_block_generic_impl.cc
index 90bdc35c5..1705e38e8 100644
--- a/gr-uhd/lib/rfnoc_block_generic_impl.cc
+++ b/gr-uhd/lib/rfnoc_block_generic_impl.cc
@@ -26,9 +26,9 @@ rfnoc_block_generic::make(rfnoc_graph::sptr graph,
                           const int device_select,
                           const int block_select)
 {
-    return gnuradio::get_initial_sptr(
-        new rfnoc_block_generic_impl(rfnoc_block::make_block_ref(
-            graph, block_args, block_name, device_select, block_select)));
+    return gnuradio::make_block_sptr<rfnoc_block_generic_impl>(
+        rfnoc_block::make_block_ref(
+            graph, block_args, block_name, device_select, block_select));
 }
 
 rfnoc_block_generic_impl::rfnoc_block_generic_impl(
diff --git a/gr-uhd/lib/rfnoc_ddc_impl.cc b/gr-uhd/lib/rfnoc_ddc_impl.cc
index 7559c6acf..bbc1978f7 100644
--- a/gr-uhd/lib/rfnoc_ddc_impl.cc
+++ b/gr-uhd/lib/rfnoc_ddc_impl.cc
@@ -21,8 +21,8 @@ rfnoc_ddc::sptr rfnoc_ddc::make(rfnoc_graph::sptr graph,
                                 const int device_select,
                                 const int instance)
 {
-    return gnuradio::get_initial_sptr(new rfnoc_ddc_impl(
-        rfnoc_block::make_block_ref(graph, block_args, "DDC", device_select, instance)));
+    return gnuradio::make_block_sptr<rfnoc_ddc_impl>(
+        rfnoc_block::make_block_ref(graph, block_args, "DDC", device_select, instance));
 }
 
 
diff --git a/gr-uhd/lib/rfnoc_duc_impl.cc b/gr-uhd/lib/rfnoc_duc_impl.cc
index c77f2313b..b542f34cd 100644
--- a/gr-uhd/lib/rfnoc_duc_impl.cc
+++ b/gr-uhd/lib/rfnoc_duc_impl.cc
@@ -21,8 +21,8 @@ rfnoc_duc::sptr rfnoc_duc::make(rfnoc_graph::sptr graph,
                                 const int device_select,
                                 const int instance)
 {
-    return gnuradio::get_initial_sptr(new rfnoc_duc_impl(
-        rfnoc_block::make_block_ref(graph, block_args, "DUC", device_select, instance)));
+    return gnuradio::make_block_sptr<rfnoc_duc_impl>(
+        rfnoc_block::make_block_ref(graph, block_args, "DUC", device_select, instance));
 }
 
 
diff --git a/gr-uhd/lib/rfnoc_rx_radio_impl.cc b/gr-uhd/lib/rfnoc_rx_radio_impl.cc
index 3012e0fbf..f6786cbfe 100644
--- a/gr-uhd/lib/rfnoc_rx_radio_impl.cc
+++ b/gr-uhd/lib/rfnoc_rx_radio_impl.cc
@@ -23,8 +23,8 @@ rfnoc_rx_radio::sptr rfnoc_rx_radio::make(rfnoc_graph::sptr graph,
                                           const int device_select,
                                           const int instance)
 {
-    return gnuradio::get_initial_sptr(new rfnoc_rx_radio_impl(rfnoc_block::make_block_ref(
-        graph, block_args, "Radio", device_select, instance, MAX_RADIO_REFS)));
+    return gnuradio::make_block_sptr<rfnoc_rx_radio_impl>(rfnoc_block::make_block_ref(
+        graph, block_args, "Radio", device_select, instance, MAX_RADIO_REFS));
 }
 
 
diff --git a/gr-uhd/lib/rfnoc_rx_streamer_impl.cc b/gr-uhd/lib/rfnoc_rx_streamer_impl.cc
index ee7e854cd..cb85d347d 100644
--- a/gr-uhd/lib/rfnoc_rx_streamer_impl.cc
+++ b/gr-uhd/lib/rfnoc_rx_streamer_impl.cc
@@ -33,8 +33,8 @@ rfnoc_rx_streamer::sptr rfnoc_rx_streamer::make(rfnoc_graph::sptr graph,
                                                 const size_t vlen,
                                                 const bool issue_stream_cmd_on_start)
 {
-    return gnuradio::get_initial_sptr(new rfnoc_rx_streamer_impl(
-        graph, num_chans, stream_args, vlen, issue_stream_cmd_on_start));
+    return gnuradio::make_block_sptr<rfnoc_rx_streamer_impl>(
+        graph, num_chans, stream_args, vlen, issue_stream_cmd_on_start);
 }
 
 
diff --git a/gr-uhd/lib/rfnoc_tx_radio_impl.cc b/gr-uhd/lib/rfnoc_tx_radio_impl.cc
index 531eb7539..64190dd2d 100644
--- a/gr-uhd/lib/rfnoc_tx_radio_impl.cc
+++ b/gr-uhd/lib/rfnoc_tx_radio_impl.cc
@@ -23,8 +23,8 @@ rfnoc_tx_radio::sptr rfnoc_tx_radio::make(rfnoc_graph::sptr graph,
                                           const int device_select,
                                           const int instance)
 {
-    return gnuradio::get_initial_sptr(new rfnoc_tx_radio_impl(rfnoc_block::make_block_ref(
-        graph, block_args, "Radio", device_select, instance, MAX_RADIO_REFS)));
+    return gnuradio::make_block_sptr<rfnoc_tx_radio_impl>(rfnoc_block::make_block_ref(
+        graph, block_args, "Radio", device_select, instance, MAX_RADIO_REFS));
 }
 
 
diff --git a/gr-uhd/lib/rfnoc_tx_streamer_impl.cc b/gr-uhd/lib/rfnoc_tx_streamer_impl.cc
index 9a12a8b3f..3dcc43ab3 100644
--- a/gr-uhd/lib/rfnoc_tx_streamer_impl.cc
+++ b/gr-uhd/lib/rfnoc_tx_streamer_impl.cc
@@ -26,8 +26,8 @@ rfnoc_tx_streamer::sptr rfnoc_tx_streamer::make(rfnoc_graph::sptr graph,
                                                 const ::uhd::stream_args_t& stream_args,
                                                 const size_t vlen)
 {
-    return gnuradio::get_initial_sptr(
-        new rfnoc_tx_streamer_impl(graph, num_chans, stream_args, vlen));
+    return gnuradio::make_block_sptr<rfnoc_tx_streamer_impl>(
+        graph, num_chans, stream_args, vlen);
 }