diff options
author | Johnathan Corgan | 2010-08-03 14:21:46 -0700 |
---|---|---|
committer | Johnathan Corgan | 2010-08-03 14:21:46 -0700 |
commit | f2020441564063e7595ed2f82a858500deda9252 (patch) | |
tree | 5d9c376a711f4acb1d42ecd46834bc5a508d16fe /gr-pager | |
parent | 5198dfe1d9fae8a2b4fa180cdc868a3bfdded7f5 (diff) | |
parent | 62328b4e78e2df20bccb2983bbe7591f99ba013f (diff) | |
download | gnuradio-f2020441564063e7595ed2f82a858500deda9252.tar.gz gnuradio-f2020441564063e7595ed2f82a858500deda9252.tar.bz2 gnuradio-f2020441564063e7595ed2f82a858500deda9252.zip |
Merge branch 'master' into next
Diffstat (limited to 'gr-pager')
-rw-r--r-- | gr-pager/lib/pager_flex_deinterleave.cc | 4 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_parse.cc | 4 | ||||
-rw-r--r-- | gr-pager/lib/pager_flex_sync.cc | 4 | ||||
-rw-r--r-- | gr-pager/lib/pager_slicer_fb.cc | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gr-pager/lib/pager_flex_deinterleave.cc b/gr-pager/lib/pager_flex_deinterleave.cc index 25ea22e39..a51670b22 100644 --- a/gr-pager/lib/pager_flex_deinterleave.cc +++ b/gr-pager/lib/pager_flex_deinterleave.cc @@ -1,5 +1,5 @@ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -30,7 +30,7 @@ pager_flex_deinterleave_sptr pager_make_flex_deinterleave() { - return pager_flex_deinterleave_sptr(new pager_flex_deinterleave()); + return gnuradio::get_initial_sptr(new pager_flex_deinterleave()); } pager_flex_deinterleave::pager_flex_deinterleave() : diff --git a/gr-pager/lib/pager_flex_parse.cc b/gr-pager/lib/pager_flex_parse.cc index 0819294da..19d3d96c6 100644 --- a/gr-pager/lib/pager_flex_parse.cc +++ b/gr-pager/lib/pager_flex_parse.cc @@ -1,5 +1,5 @@ /* - * Copyright 2004,2006,2007 Free Software Foundation, Inc. + * Copyright 2004,2006,2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq) { - return pager_flex_parse_sptr(new pager_flex_parse(queue, freq)); + return gnuradio::get_initial_sptr(new pager_flex_parse(queue, freq)); } pager_flex_parse::pager_flex_parse(gr_msg_queue_sptr queue, float freq) : diff --git a/gr-pager/lib/pager_flex_sync.cc b/gr-pager/lib/pager_flex_sync.cc index 6bcee8ede..61cf4ad38 100644 --- a/gr-pager/lib/pager_flex_sync.cc +++ b/gr-pager/lib/pager_flex_sync.cc @@ -1,5 +1,5 @@ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -33,7 +33,7 @@ pager_flex_sync_sptr pager_make_flex_sync() { - return pager_flex_sync_sptr(new pager_flex_sync()); + return gnuradio::get_initial_sptr(new pager_flex_sync()); } // FLEX sync block takes input from sliced baseband stream [0-3] at specified diff --git a/gr-pager/lib/pager_slicer_fb.cc b/gr-pager/lib/pager_slicer_fb.cc index d419db78a..53ba7b9de 100644 --- a/gr-pager/lib/pager_slicer_fb.cc +++ b/gr-pager/lib/pager_slicer_fb.cc @@ -1,5 +1,5 @@ /* - * Copyright 2004,2006,2007 Free Software Foundation, Inc. + * Copyright 2004,2006,2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -28,7 +28,7 @@ pager_slicer_fb_sptr pager_make_slicer_fb(float alpha) { - return pager_slicer_fb_sptr(new pager_slicer_fb(alpha)); + return gnuradio::get_initial_sptr(new pager_slicer_fb(alpha)); } pager_slicer_fb::pager_slicer_fb(float alpha) : |