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-usrp/src/usrp_sink_s.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 'gr-usrp/src/usrp_sink_s.cc')
| -rw-r--r-- | gr-usrp/src/usrp_sink_s.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-usrp/src/usrp_sink_s.cc b/gr-usrp/src/usrp_sink_s.cc index 1f51da24d..1ffaeed96 100644 --- a/gr-usrp/src/usrp_sink_s.cc +++ b/gr-usrp/src/usrp_sink_s.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2006,2009 Free Software Foundation, Inc. + * Copyright 2004,2006,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -40,7 +40,7 @@ usrp_make_sink_s (int which_board, const std::string firmware_filename ) throw (std::runtime_error) { - return usrp_sink_s_sptr (new usrp_sink_s (which_board, + return gnuradio::get_initial_sptr(new usrp_sink_s (which_board, interp_rate, nchan, mux, |