diff options
author | Eric Blossom | 2010-08-03 13:36:18 -0700 |
---|---|---|
committer | Eric Blossom | 2010-08-03 13:43:42 -0700 |
commit | 0a9b999b5cce596f4de05828005f698047e14ce9 (patch) | |
tree | 3d77eabfdc798322a13cceb9253da152470bdbd9 /gnuradio-core/src/lib/gengen | |
parent | fa56c39802a82e6e0e730813a57e86e1aea09a24 (diff) | |
download | gnuradio-0a9b999b5cce596f4de05828005f698047e14ce9.tar.gz gnuradio-0a9b999b5cce596f4de05828005f698047e14ce9.tar.bz2 gnuradio-0a9b999b5cce596f4de05828005f698047e14ce9.zip |
Modify all block factories to use gnuradio::get_initial_sptr.
Diffstat (limited to 'gnuradio-core/src/lib/gengen')
23 files changed, 46 insertions, 46 deletions
diff --git a/gnuradio-core/src/lib/gengen/gr_add_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_add_XX.cc.t index 2e44c5ea7..58a25325a 100644 --- a/gnuradio-core/src/lib/gengen/gr_add_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_add_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004, 2009 Free Software Foundation, Inc. + * Copyright 2004, 2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen) { - return @SPTR_NAME@ (new @NAME@ (vlen)); + return gnuradio::get_initial_sptr (new @NAME@ (vlen)); } @NAME@::@NAME@ (size_t vlen) diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_add_const_XX.cc.t index 3df3ea9c6..0d3034be7 100644 --- a/gnuradio-core/src/lib/gengen/gr_add_const_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_add_const_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k) { - return @SPTR_NAME@ (new @NAME@ (k)); + return gnuradio::get_initial_sptr (new @NAME@ (k)); } @NAME@::@NAME@ (@O_TYPE@ k) diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vXX.cc.t b/gnuradio-core/src/lib/gengen/gr_add_const_vXX.cc.t index 0e6588dc0..2a0a3ba3f 100755 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vXX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_add_const_vXX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k) { - return @SPTR_NAME@ (new @NAME@ (k)); + return gnuradio::get_initial_sptr (new @NAME@ (k)); } @NAME@::@NAME@ (const std::vector<@I_TYPE@> k) diff --git a/gnuradio-core/src/lib/gengen/gr_and_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_and_XX.cc.t index cef21d333..150ef7f0d 100644 --- a/gnuradio-core/src/lib/gengen/gr_and_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_and_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ () { - return @SPTR_NAME@ (new @NAME@ ()); + return gnuradio::get_initial_sptr (new @NAME@ ()); } @NAME@::@NAME@ () diff --git a/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t index ec725b23d..bd48788e6 100644 --- a/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_and_const_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2009 Free Software Foundation, Inc. + * Copyright 2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (@I_TYPE@ k) { - return @SPTR_NAME@ (new @NAME@ (k)); + return gnuradio::get_initial_sptr (new @NAME@ (k)); }; @NAME@::@NAME@ (@I_TYPE@ k) diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t index ab61fb08d..635d991ef 100644 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -35,7 +35,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D) { - return @SPTR_NAME@ (new @NAME@ (symbol_table,D)); + return gnuradio::get_initial_sptr (new @NAME@ (symbol_table,D)); } @NAME@::@NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D) diff --git a/gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t index 2db490f13..1200145fa 100644 --- a/gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004, 2009 Free Software Foundation, Inc. + * Copyright 2004, 2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen) { - return @SPTR_NAME@ (new @NAME@ (vlen)); + return gnuradio::get_initial_sptr (new @NAME@ (vlen)); } @NAME@::@NAME@ (size_t vlen) diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_integrate_XX.cc.t index 0a62554bd..f6e38848c 100644 --- a/gnuradio-core/src/lib/gengen/gr_integrate_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_integrate_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (int decim) { - return @SPTR_NAME@ (new @NAME@ (decim)); + return gnuradio::get_initial_sptr (new @NAME@ (decim)); } @NAME@::@NAME@ (int decim) diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_moving_average_XX.cc.t index 33a0acf9c..8d2370d3b 100644 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_moving_average_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (int length, @O_TYPE@ scale, int max_iter) { - return @SPTR_NAME@ (new @NAME@ (length, scale, max_iter)); + return gnuradio::get_initial_sptr (new @NAME@ (length, scale, max_iter)); } @NAME@::@NAME@ (int length, @O_TYPE@ scale, int max_iter) diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t index 000c5e0bd..13ec0c8b3 100644 --- a/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004, 2009 Free Software Foundation, Inc. + * Copyright 2004, 2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen) { - return @SPTR_NAME@ (new @NAME@ (vlen)); + return gnuradio::get_initial_sptr (new @NAME@ (vlen)); } @NAME@::@NAME@ (size_t vlen) diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_multiply_const_XX.cc.t index 715782dd1..09e658e90 100644 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_multiply_const_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k) { - return @SPTR_NAME@ (new @NAME@ (k)); + return gnuradio::get_initial_sptr (new @NAME@ (k)); } @NAME@::@NAME@ (@O_TYPE@ k) diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vXX.cc.t b/gnuradio-core/src/lib/gengen/gr_multiply_const_vXX.cc.t index 5b92ea8a1..8286453f1 100755 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vXX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_multiply_const_vXX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k) { - return @SPTR_NAME@ (new @NAME@ (k)); + return gnuradio::get_initial_sptr (new @NAME@ (k)); } @NAME@::@NAME@ (const std::vector<@I_TYPE@> k) diff --git a/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t index ee49d97b4..62a8e63da 100644 --- a/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -34,7 +34,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (bool mute) { - return @SPTR_NAME@ (new @NAME@ (mute)); + return gnuradio::get_initial_sptr (new @NAME@ (mute)); } @NAME@::@NAME@ (bool mute) diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_X.cc.t b/gnuradio-core/src/lib/gengen/gr_noise_source_X.cc.t index 83be9aa18..35f5fabd9 100644 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_X.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_noise_source_X.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -33,7 +33,7 @@ @NAME@_sptr gr_make_@BASE_NAME@ (gr_noise_type_t type, float ampl, long seed) { - return @NAME@_sptr (new @NAME@ (type, ampl, seed)); + return gnuradio::get_initial_sptr(new @NAME@ (type, ampl, seed)); } diff --git a/gnuradio-core/src/lib/gengen/gr_not_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_not_XX.cc.t index 272987411..432938e67 100644 --- a/gnuradio-core/src/lib/gengen/gr_not_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_not_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ () { - return @SPTR_NAME@ (new @NAME@ ()); + return gnuradio::get_initial_sptr (new @NAME@ ()); } @NAME@::@NAME@ () diff --git a/gnuradio-core/src/lib/gengen/gr_or_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_or_XX.cc.t index e118cdbbb..07c759d73 100644 --- a/gnuradio-core/src/lib/gengen/gr_or_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_or_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ () { - return @SPTR_NAME@ (new @NAME@ ()); + return gnuradio::get_initial_sptr (new @NAME@ ()); } @NAME@::@NAME@ () diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t index ce6316920..1a4a2564b 100644 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -35,7 +35,7 @@ gr_make_@BASE_NAME@ (float threshold_factor_rise, float threshold_factor_fall, int look_ahead, float alpha) { - return @SPTR_NAME@ (new @NAME@ (threshold_factor_rise, + return gnuradio::get_initial_sptr (new @NAME@ (threshold_factor_rise, threshold_factor_fall, look_ahead, alpha)); } diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t index 52538286e..b78c52857 100644 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ () { - return @SPTR_NAME@ (new @NAME@ ()); + return gnuradio::get_initial_sptr (new @NAME@ ()); } @NAME@::@NAME@ () diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t b/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t index 0694df315..9354eb93c 100644 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -47,7 +47,7 @@ gr_make_@BASE_NAME@ (double sampling_freq, gr_waveform_t waveform, double frequency, double ampl, @TYPE@ offset) { - return @NAME@_sptr (new @NAME@ (sampling_freq, waveform, frequency, ampl, offset)); + return gnuradio::get_initial_sptr(new @NAME@ (sampling_freq, waveform, frequency, ampl, offset)); } int diff --git a/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t index c8bdabf9f..f0ed75217 100644 --- a/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004, 2009 Free Software Foundation, Inc. + * Copyright 2004, 2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen) { - return @SPTR_NAME@ (new @NAME@ (vlen)); + return gnuradio::get_initial_sptr (new @NAME@ (vlen)); } @NAME@::@NAME@ (size_t vlen) diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_X.cc.t b/gnuradio-core/src/lib/gengen/gr_vector_sink_X.cc.t index b2a6c4ac4..f3466d46f 100644 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_X.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_vector_sink_X.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -54,7 +54,7 @@ int @NAME@_sptr gr_make_@BASE_NAME@ (int vlen) { - return @NAME@_sptr (new @NAME@ (vlen)); + return gnuradio::get_initial_sptr(new @NAME@ (vlen)); } std::vector<@TYPE@> diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_X.cc.t b/gnuradio-core/src/lib/gengen/gr_vector_source_X.cc.t index 889a6f22c..1fe5df5b5 100644 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_X.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_vector_source_X.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -84,6 +84,6 @@ int @NAME@_sptr gr_make_@BASE_NAME@ (const std::vector<@TYPE@> &data, bool repeat, int vlen) { - return @NAME@_sptr (new @NAME@ (data, repeat, vlen)); + return gnuradio::get_initial_sptr(new @NAME@ (data, repeat, vlen)); } diff --git a/gnuradio-core/src/lib/gengen/gr_xor_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_xor_XX.cc.t index f64dd1c97..29230f7a6 100644 --- a/gnuradio-core/src/lib/gengen/gr_xor_XX.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_xor_XX.cc.t @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2008 Free Software Foundation, Inc. + * Copyright 2004,2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ @SPTR_NAME@ gr_make_@BASE_NAME@ () { - return @SPTR_NAME@ (new @NAME@ ()); + return gnuradio::get_initial_sptr (new @NAME@ ()); } @NAME@::@NAME@ () |