13 files changed, 21 insertions, 22 deletions
diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc
index 7188c23cc4..e8c04829b9 100644
--- a/gr-fec/lib/async_decoder_impl.cc
+++ b/gr-fec/lib/async_decoder_impl.cc
@@ -23,8 +23,8 @@ namespace fec {
 async_decoder::sptr
 async_decoder::make(generic_decoder::sptr my_decoder, bool packed, bool rev_pack, int mtu)
 {
-    return gnuradio::get_initial_sptr(
-        new async_decoder_impl(my_decoder, packed, rev_pack, mtu));
+    return gnuradio::make_block_sptr<async_decoder_impl>(
+        my_decoder, packed, rev_pack, mtu);
 }
 
 async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder,
diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc
index e8d24ad331..1dcfc3658e 100644
--- a/gr-fec/lib/async_encoder_impl.cc
+++ b/gr-fec/lib/async_encoder_impl.cc
@@ -26,8 +26,8 @@ async_encoder::sptr async_encoder::make(generic_encoder::sptr my_encoder,
                                         bool rev_pack,
                                         int mtu)
 {
-    return gnuradio::get_initial_sptr(
-        new async_encoder_impl(my_encoder, packed, rev_unpack, rev_pack, mtu));
+    return gnuradio::make_block_sptr<async_encoder_impl>(
+        my_encoder, packed, rev_unpack, rev_pack, mtu);
 }
 
 async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder,
diff --git a/gr-fec/lib/ber_bf_impl.cc b/gr-fec/lib/ber_bf_impl.cc
index 3f9c6ccb72..c35a7eca5c 100644
--- a/gr-fec/lib/ber_bf_impl.cc
+++ b/gr-fec/lib/ber_bf_impl.cc
@@ -22,8 +22,7 @@ namespace fec {
 
 ber_bf::sptr ber_bf::make(bool test_mode, int berminerrors, float ber_limit)
 {
-    return gnuradio::get_initial_sptr(
-        new ber_bf_impl(test_mode, berminerrors, ber_limit));
+    return gnuradio::make_block_sptr<ber_bf_impl>(test_mode, berminerrors, ber_limit);
 }
 
 ber_bf_impl::ber_bf_impl(bool test_mode, int berminerrors, float ber_limit)
diff --git a/gr-fec/lib/conv_bit_corr_bb_impl.cc b/gr-fec/lib/conv_bit_corr_bb_impl.cc
index f99eaadb50..f6fc2aa048 100644
--- a/gr-fec/lib/conv_bit_corr_bb_impl.cc
+++ b/gr-fec/lib/conv_bit_corr_bb_impl.cc
@@ -27,8 +27,8 @@ conv_bit_corr_bb::sptr conv_bit_corr_bb::make(std::vector<unsigned long long> co
                                               int flush,
                                               float thresh)
 {
-    return gnuradio::get_initial_sptr(
-        new conv_bit_corr_bb_impl(correlator, corr_sym, corr_len, cut, flush, thresh));
+    return gnuradio::make_block_sptr<conv_bit_corr_bb_impl>(
+        correlator, corr_sym, corr_len, cut, flush, thresh);
 }
 
 conv_bit_corr_bb_impl::conv_bit_corr_bb_impl(std::vector<unsigned long long> correlator,
diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.cc b/gr-fec/lib/decode_ccsds_27_fb_impl.cc
index 9df8f263fb..c13e6fc689 100644
--- a/gr-fec/lib/decode_ccsds_27_fb_impl.cc
+++ b/gr-fec/lib/decode_ccsds_27_fb_impl.cc
@@ -20,7 +20,7 @@ namespace fec {
 
 decode_ccsds_27_fb::sptr decode_ccsds_27_fb::make()
 {
-    return gnuradio::get_initial_sptr(new decode_ccsds_27_fb_impl());
+    return gnuradio::make_block_sptr<decode_ccsds_27_fb_impl>();
 }
 
 decode_ccsds_27_fb_impl::decode_ccsds_27_fb_impl()
diff --git a/gr-fec/lib/decoder_impl.cc b/gr-fec/lib/decoder_impl.cc
index bb4a654c0c..afaa980cd8 100644
--- a/gr-fec/lib/decoder_impl.cc
+++ b/gr-fec/lib/decoder_impl.cc
@@ -23,8 +23,8 @@ decoder::sptr decoder::make(generic_decoder::sptr my_decoder,
                             size_t input_item_size,
                             size_t output_item_size)
 {
-    return gnuradio::get_initial_sptr(
-        new decoder_impl(my_decoder, input_item_size, output_item_size));
+    return gnuradio::make_block_sptr<decoder_impl>(
+        my_decoder, input_item_size, output_item_size);
 }
 
 decoder_impl::decoder_impl(generic_decoder::sptr my_decoder,
diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc
index d5a765f2a2..b0e17ea2bd 100644
--- a/gr-fec/lib/depuncture_bb_impl.cc
+++ b/gr-fec/lib/depuncture_bb_impl.cc
@@ -26,8 +26,8 @@ namespace fec {
 depuncture_bb::sptr
 depuncture_bb::make(int puncsize, int puncpat, int delay, uint8_t symbol)
 {
-    return gnuradio::get_initial_sptr(
-        new depuncture_bb_impl(puncsize, puncpat, delay, symbol));
+    return gnuradio::make_block_sptr<depuncture_bb_impl>(
+        puncsize, puncpat, delay, symbol);
 }
 
 depuncture_bb_impl::depuncture_bb_impl(int puncsize,
diff --git a/gr-fec/lib/encode_ccsds_27_bb_impl.cc b/gr-fec/lib/encode_ccsds_27_bb_impl.cc
index 27644c1928..6e4d78546b 100644
--- a/gr-fec/lib/encode_ccsds_27_bb_impl.cc
+++ b/gr-fec/lib/encode_ccsds_27_bb_impl.cc
@@ -22,7 +22,7 @@ namespace fec {
 
 encode_ccsds_27_bb::sptr encode_ccsds_27_bb::make()
 {
-    return gnuradio::get_initial_sptr(new encode_ccsds_27_bb_impl());
+    return gnuradio::make_block_sptr<encode_ccsds_27_bb_impl>();
 }
 
 encode_ccsds_27_bb_impl::encode_ccsds_27_bb_impl()
diff --git a/gr-fec/lib/encoder_impl.cc b/gr-fec/lib/encoder_impl.cc
index 4fe2fd9b75..0501ca09a6 100644
--- a/gr-fec/lib/encoder_impl.cc
+++ b/gr-fec/lib/encoder_impl.cc
@@ -23,8 +23,8 @@ encoder::sptr encoder::make(generic_encoder::sptr my_encoder,
                             size_t input_item_size,
                             size_t output_item_size)
 {
-    return gnuradio::get_initial_sptr(
-        new encoder_impl(my_encoder, input_item_size, output_item_size));
+    return gnuradio::make_block_sptr<encoder_impl>(
+        my_encoder, input_item_size, output_item_size);
 }
 
 encoder_impl::encoder_impl(generic_encoder::sptr my_encoder,
diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc
index 49f1bcfb55..5ea14bb005 100644
--- a/gr-fec/lib/puncture_bb_impl.cc
+++ b/gr-fec/lib/puncture_bb_impl.cc
@@ -25,7 +25,7 @@ namespace fec {
 
 puncture_bb::sptr puncture_bb::make(int puncsize, int puncpat, int delay)
 {
-    return gnuradio::get_initial_sptr(new puncture_bb_impl(puncsize, puncpat, delay));
+    return gnuradio::make_block_sptr<puncture_bb_impl>(puncsize, puncpat, delay);
 }
 
 puncture_bb_impl::puncture_bb_impl(int puncsize, int puncpat, int delay)
diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc
index 4b8c74f014..03a76d1a4a 100644
--- a/gr-fec/lib/puncture_ff_impl.cc
+++ b/gr-fec/lib/puncture_ff_impl.cc
@@ -25,7 +25,7 @@ namespace fec {
 
 puncture_ff::sptr puncture_ff::make(int puncsize, int puncpat, int delay)
 {
-    return gnuradio::get_initial_sptr(new puncture_ff_impl(puncsize, puncpat, delay));
+    return gnuradio::make_block_sptr<puncture_ff_impl>(puncsize, puncpat, delay);
 }
 
 puncture_ff_impl::puncture_ff_impl(int puncsize, int puncpat, int delay)
diff --git a/gr-fec/lib/tagged_decoder_impl.cc b/gr-fec/lib/tagged_decoder_impl.cc
index 06e96acebf..e06d55c0b2 100644
--- a/gr-fec/lib/tagged_decoder_impl.cc
+++ b/gr-fec/lib/tagged_decoder_impl.cc
@@ -25,8 +25,8 @@ tagged_decoder::sptr tagged_decoder::make(generic_decoder::sptr my_decoder,
                                           const std::string& lengthtagname,
                                           int mtu)
 {
-    return gnuradio::get_initial_sptr(new tagged_decoder_impl(
-        my_decoder, input_item_size, output_item_size, lengthtagname, mtu));
+    return gnuradio::make_block_sptr<tagged_decoder_impl>(
+        my_decoder, input_item_size, output_item_size, lengthtagname, mtu);
 }
 
 tagged_decoder_impl::tagged_decoder_impl(generic_decoder::sptr my_decoder,
diff --git a/gr-fec/lib/tagged_encoder_impl.cc b/gr-fec/lib/tagged_encoder_impl.cc
index 11e39a730e..e3d0f3fad5 100644
--- a/gr-fec/lib/tagged_encoder_impl.cc
+++ b/gr-fec/lib/tagged_encoder_impl.cc
@@ -25,8 +25,8 @@ tagged_encoder::sptr tagged_encoder::make(generic_encoder::sptr my_encoder,
                                           const std::string& lengthtagname,
                                           int mtu)
 {
-    return gnuradio::get_initial_sptr(new tagged_encoder_impl(
-        my_encoder, input_item_size, output_item_size, lengthtagname, mtu));
+    return gnuradio::make_block_sptr<tagged_encoder_impl>(
+        my_encoder, input_item_size, output_item_size, lengthtagname, mtu);
 }
 
 tagged_encoder_impl::tagged_encoder_impl(generic_encoder::sptr my_encoder,