projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.3.1' into try-3.3.1
[debian/gnuradio]
/
gr-usrp
/
src
/
usrp_source_s.cc
diff --git
a/gr-usrp/src/usrp_source_s.cc
b/gr-usrp/src/usrp_source_s.cc
index 88b8495d3679512f165491146c6b5055850ec10d..8e1c2f188bd4c439c84ecb0cd516dc6b52a50678 100644
(file)
--- a/
gr-usrp/src/usrp_source_s.cc
+++ b/
gr-usrp/src/usrp_source_s.cc
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- 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
*
*
* 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)
{
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,
decim_rate,
nchan,
mux,