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-usrp/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-usrp/src')
| -rw-r--r-- | gr-usrp/src/usrp_sink_c.cc | 4 | ||||
| -rw-r--r-- | gr-usrp/src/usrp_sink_s.cc | 4 | ||||
| -rw-r--r-- | gr-usrp/src/usrp_source_c.cc | 4 | ||||
| -rw-r--r-- | gr-usrp/src/usrp_source_s.cc | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gr-usrp/src/usrp_sink_c.cc b/gr-usrp/src/usrp_sink_c.cc index 40750b477..7054158d8 100644 --- a/gr-usrp/src/usrp_sink_c.cc +++ b/gr-usrp/src/usrp_sink_c.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_c (int which_board, const std::string firmware_filename ) throw (std::runtime_error) { - return usrp_sink_c_sptr (new usrp_sink_c (which_board, + return gnuradio::get_initial_sptr(new usrp_sink_c (which_board, interp_rate, nchan, mux, 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, diff --git a/gr-usrp/src/usrp_source_c.cc b/gr-usrp/src/usrp_source_c.cc index 26d95dc1b..9055f3ee7 100644 --- a/gr-usrp/src/usrp_source_c.cc +++ b/gr-usrp/src/usrp_source_c.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 * @@ -43,7 +43,7 @@ usrp_make_source_c (int which_board, const std::string firmware_filename ) throw (std::runtime_error) { - return usrp_source_c_sptr (new usrp_source_c (which_board, + return gnuradio::get_initial_sptr(new usrp_source_c (which_board, decim_rate, nchan, mux, diff --git a/gr-usrp/src/usrp_source_s.cc b/gr-usrp/src/usrp_source_s.cc index 88b8495d3..8e1c2f188 100644 --- a/gr-usrp/src/usrp_source_s.cc +++ b/gr-usrp/src/usrp_source_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 * @@ -43,7 +43,7 @@ usrp_make_source_s (int which_board, const std::string firmware_filename ) throw (std::runtime_error) { - return usrp_source_s_sptr (new usrp_source_s (which_board, + return gnuradio::get_initial_sptr(new usrp_source_s (which_board, decim_rate, nchan, mux, |