diff options
| author | Tom Rondeau | 2011-10-06 14:41:43 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-06 14:41:43 -0400 |
| commit | 8523d8a0fa1dba59d45defc27cd630901c91e76e (patch) | |
| tree | 6e536bda47a86381043f3483342ee172a4ba3106 /gr-uhd | |
| parent | 34fbf0c82a09be1f14fc85829317a2ee4bf0b793 (diff) | |
| parent | 178590c3afae08ccafd3db711e2cfa65c841403f (diff) | |
| download | gnuradio-8523d8a0fa1dba59d45defc27cd630901c91e76e.tar.gz gnuradio-8523d8a0fa1dba59d45defc27cd630901c91e76e.tar.bz2 gnuradio-8523d8a0fa1dba59d45defc27cd630901c91e76e.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 93bf5bfbe..f8381ae64 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -26,6 +26,9 @@ #define GR_UHD_API +//suppress 319. No access specifier given for base class name (ignored). +#pragma SWIG nowarn=319 + //////////////////////////////////////////////////////////////////////// // standard includes //////////////////////////////////////////////////////////////////////// @@ -72,8 +75,6 @@ %include <uhd/types/metadata.hpp> -%ignore uhd::device::register_device; //causes compile to choke in MSVC -%include <uhd/device.hpp> %template(device_addr_vector_t) std::vector<uhd::device_addr_t>; %include <uhd/types/sensors.hpp> |