summaryrefslogtreecommitdiff
path: root/gr-uhd
diff options
context:
space:
mode:
authorTom Rondeau2011-10-06 14:41:32 -0400
committerTom Rondeau2011-10-06 14:41:32 -0400
commit178590c3afae08ccafd3db711e2cfa65c841403f (patch)
tree473866077c06d6858942a04c1eb67844ca6b10ad /gr-uhd
parentab8b8c0a683c09db5bb8a715b12f1d012bea0d48 (diff)
parent1a3383b19e089d6a8975b991fefe749cac396109 (diff)
downloadgnuradio-178590c3afae08ccafd3db711e2cfa65c841403f.tar.gz
gnuradio-178590c3afae08ccafd3db711e2cfa65c841403f.tar.bz2
gnuradio-178590c3afae08ccafd3db711e2cfa65c841403f.zip
Merge branch 'maint'
Diffstat (limited to 'gr-uhd')
-rw-r--r--gr-uhd/swig/uhd_swig.i5
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>