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 /gnuradio-core/src/lib/general/gr_nop.cc | |
| 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 'gnuradio-core/src/lib/general/gr_nop.cc')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_nop.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/gr_nop.cc b/gnuradio-core/src/lib/general/gr_nop.cc index b8d5cb3ac..e69c8b340 100644 --- a/gnuradio-core/src/lib/general/gr_nop.cc +++ b/gnuradio-core/src/lib/general/gr_nop.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 * @@ -36,7 +36,7 @@ gr_nop::gr_nop (size_t sizeof_stream_item) gr_block_sptr gr_make_nop (size_t sizeof_stream_item) { - return gr_block_sptr (new gr_nop (sizeof_stream_item)); + return gnuradio::get_initial_sptr (new gr_nop (sizeof_stream_item)); } int |