diff options
| author | Tom Rondeau | 2011-07-27 21:09:33 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-07-27 21:09:33 -0400 |
| commit | 0a8bf57af56126ab5254f66c4e707266c2df49be (patch) | |
| tree | f6d301ddeee36944c4e658107e474af6b9bfd7a6 | |
| parent | 302bd2d7125ba1a973433a9ef7cd9afba2d47438 (diff) | |
| parent | c491449c8e402efdf49e978c74ddbb684807c645 (diff) | |
| download | gnuradio-0a8bf57af56126ab5254f66c4e707266c2df49be.tar.gz gnuradio-0a8bf57af56126ab5254f66c4e707266c2df49be.tar.bz2 gnuradio-0a8bf57af56126ab5254f66c4e707266c2df49be.zip | |
Merge branch 'master' into next
* master:
Fixed warnings generated from improper includes in swig interface file.
Fixed doxygen warning in gr-uhd
| -rw-r--r-- | gr-qtgui/swig/qtgui_swig.i | 8 | ||||
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i index 5a4ffd6fb..7cf8873e7 100644 --- a/gr-qtgui/swig/qtgui_swig.i +++ b/gr-qtgui/swig/qtgui_swig.i @@ -23,10 +23,10 @@ %include "gnuradio.i" %{ -#include <qtgui_sink_c.h> -#include <qtgui_sink_f.h> -#include <qtgui_time_sink_c.h> -#include <qtgui_time_sink_f.h> +#include "qtgui_sink_c.h" +#include "qtgui_sink_f.h" +#include "qtgui_time_sink_c.h" +#include "qtgui_time_sink_f.h" %} %include "qtgui_sink_c.i" diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index 36331f782..6e51a1423 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -125,7 +125,6 @@ public: /*! * Get the actual dboard gain setting of named stage. - * \param name the name of the gain stage * \param chan the channel index 0 to N-1 * \return the actual gain in dB */ |