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-gsm-fr-vocoder/src | |
| 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-gsm-fr-vocoder/src')
| -rw-r--r-- | gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.cc | 4 | ||||
| -rw-r--r-- | gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.cc b/gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.cc index c4fc782fa..9b788dedf 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.cc +++ b/gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005 Free Software Foundation, Inc. + * Copyright 2005,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -34,7 +34,7 @@ extern "C"{ gsm_fr_decode_ps_sptr gsm_fr_make_decode_ps () { - return gsm_fr_decode_ps_sptr (new gsm_fr_decode_ps ()); + return gnuradio::get_initial_sptr(new gsm_fr_decode_ps ()); } gsm_fr_decode_ps::gsm_fr_decode_ps () diff --git a/gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.cc b/gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.cc index 3fd35db04..10bd1fef8 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.cc +++ b/gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005 Free Software Foundation, Inc. + * Copyright 2005,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -33,7 +33,7 @@ extern "C"{ gsm_fr_encode_sp_sptr gsm_fr_make_encode_sp () { - return gsm_fr_encode_sp_sptr (new gsm_fr_encode_sp ()); + return gnuradio::get_initial_sptr(new gsm_fr_encode_sp ()); } gsm_fr_encode_sp::gsm_fr_encode_sp () |