diff options
| author | Johnathan Corgan | 2010-08-03 14:21:36 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-08-03 14:21:36 -0700 |
| commit | 62328b4e78e2df20bccb2983bbe7591f99ba013f (patch) | |
| tree | c249fa5639c2c46066782012b7075bb8b7879335 /gr-trellis/src/lib/trellis_siso_combined_f.cc | |
| parent | 8034e2cd49fd71bfdf1ed587d49781a444e1cced (diff) | |
| parent | 0a9b999b5cce596f4de05828005f698047e14ce9 (diff) | |
| download | gnuradio-62328b4e78e2df20bccb2983bbe7591f99ba013f.tar.gz gnuradio-62328b4e78e2df20bccb2983bbe7591f99ba013f.tar.bz2 gnuradio-62328b4e78e2df20bccb2983bbe7591f99ba013f.zip | |
Merge branch 'maint'
Diffstat (limited to 'gr-trellis/src/lib/trellis_siso_combined_f.cc')
| -rw-r--r-- | gr-trellis/src/lib/trellis_siso_combined_f.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-trellis/src/lib/trellis_siso_combined_f.cc b/gr-trellis/src/lib/trellis_siso_combined_f.cc index c8181d109..708608b16 100644 --- a/gr-trellis/src/lib/trellis_siso_combined_f.cc +++ b/gr-trellis/src/lib/trellis_siso_combined_f.cc @@ -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 * @@ -45,7 +45,7 @@ trellis_make_siso_combined_f ( const std::vector<float> &TABLE, trellis_metric_type_t TYPE) { - return trellis_siso_combined_f_sptr (new trellis_siso_combined_f (FSM,K,S0,SK,POSTI,POSTO,SISO_TYPE,D,TABLE,TYPE)); + return gnuradio::get_initial_sptr(new trellis_siso_combined_f (FSM,K,S0,SK,POSTI,POSTO,SISO_TYPE,D,TABLE,TYPE)); } trellis_siso_combined_f::trellis_siso_combined_f ( |