diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-07-08 13:55:12 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-07-08 13:55:12 -0700 |
| commit | 9fd0f06d3c66c144517d52b1fdd47d7ad4416aac (patch) | |
| tree | c448de12dc1423d6a452bbd7f417630a77c8366f /gr-uhd | |
| parent | 3d6dc9c0ddb34d923b55a300bdd1356ce5b9a654 (diff) | |
| parent | 63bafe76df583627286e0f20ee74206fd2f0d040 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/include/gnuradio/uhd/usrp_sink.h | 4 | ||||
| -rw-r--r-- | gr-uhd/include/gnuradio/uhd/usrp_source.h | 4 | ||||
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 8 |
3 files changed, 13 insertions, 3 deletions
diff --git a/gr-uhd/include/gnuradio/uhd/usrp_sink.h b/gr-uhd/include/gnuradio/uhd/usrp_sink.h index 35bb2e4384..d3e732cc30 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_sink.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_sink.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2013 Free Software Foundation, Inc. + * Copyright 2010-2014 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -528,6 +528,8 @@ namespace gr { /*! * Get access to the underlying uhd device object. + * + * NOTE: This function is only available in C++. * \return the multi usrp device object */ virtual ::uhd::usrp::multi_usrp::sptr get_device(void) = 0; diff --git a/gr-uhd/include/gnuradio/uhd/usrp_source.h b/gr-uhd/include/gnuradio/uhd/usrp_source.h index f330ee0901..2e165cf771 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_source.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2013 Free Software Foundation, Inc. + * Copyright 2010-2014 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -535,6 +535,8 @@ namespace gr { /*! * Get access to the underlying uhd device object. + * + * NOTE: This function is only available in C++. * \return the multi usrp device object */ virtual ::uhd::usrp::multi_usrp::sptr get_device(void) = 0; diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 4eaef9112d..a4b1528439 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2013 Free Software Foundation, Inc. + * Copyright 2010-2014 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -40,6 +40,12 @@ %include "uhd_swig_doc.i" //////////////////////////////////////////////////////////////////////// +// SWIG should not see the uhd::usrp::multi_usrp class +//////////////////////////////////////////////////////////////////////// +%ignore gr::uhd::usrp_sink::get_device; +%ignore gr::uhd::usrp_source::get_device; + +//////////////////////////////////////////////////////////////////////// // block headers //////////////////////////////////////////////////////////////////////// %{ |