diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-12 16:20:59 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-12 16:20:59 -0500 |
| commit | c352ce2edfbf7cb1d11d7af491e71825b1b858c5 (patch) | |
| tree | 7b813798d4df79ac858fd0a21c596a261e499f5d | |
| parent | 521a39ade2350f7a0078c5af34df716d15befbc3 (diff) | |
| parent | aeb7bbfdcb7cdab610de4b2576ecf7a3a92f8d50 (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_tuntap_pdu.cc | 9 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_tuntap_pdu.h | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/gnuradio-core/src/lib/io/gr_tuntap_pdu.cc b/gnuradio-core/src/lib/io/gr_tuntap_pdu.cc index d369310a64..8dd4b18a10 100644 --- a/gnuradio-core/src/lib/io/gr_tuntap_pdu.cc +++ b/gnuradio-core/src/lib/io/gr_tuntap_pdu.cc @@ -134,15 +134,6 @@ int gr_tuntap_pdu::tun_alloc(char *dev, int flags) { #else //if not linux -// Just a stub class and factory function for swig. -class gr_tuntap_pdu -{ -private: - gr_tuntap_pdu() {}; -public: - ~gr_tuntap_pdu() {}; -}; - gr_block_sptr gr_make_tuntap_pdu(std::string dev, int MTU) { diff --git a/gnuradio-core/src/lib/io/gr_tuntap_pdu.h b/gnuradio-core/src/lib/io/gr_tuntap_pdu.h index 384d577033..18c83f42b2 100644 --- a/gnuradio-core/src/lib/io/gr_tuntap_pdu.h +++ b/gnuradio-core/src/lib/io/gr_tuntap_pdu.h @@ -59,6 +59,14 @@ class GR_CORE_API gr_tuntap_pdu : public gr_stream_pdu_base #else // if not linux +class gr_tuntap_pdu +{ +private: + gr_tuntap_pdu() {}; +public: + ~gr_tuntap_pdu() {}; +}; + GR_CORE_API gr_block_sptr gr_make_tuntap_pdu (std::string dev, int MTU=0); #endif |