diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-03 16:28:26 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-03 16:28:26 -0800 |
| commit | 98028b366f840efc3b289cc7051bed73aad0963c (patch) | |
| tree | 5d26773de13c4f78326896c6eb0ff78213d0912f /host/lib/usrp/usrp2/usrp2_iface.cpp | |
| parent | f938ed7938021c10bb0a0ce47e6d40d10f89abc2 (diff) | |
| parent | 1b63cd2560886d851f3e2ba98bfddf772c44df34 (diff) | |
| download | uhd-98028b366f840efc3b289cc7051bed73aad0963c.tar.gz uhd-98028b366f840efc3b289cc7051bed73aad0963c.tar.bz2 uhd-98028b366f840efc3b289cc7051bed73aad0963c.zip | |
Merge branch 'mb_iface' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_iface.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index a872886a0..e3827233b 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -70,10 +70,6 @@ public: } } - ~usrp2_iface_impl(void){ - /* NOP */ - } - /*********************************************************************** * Peek and Poke **********************************************************************/ |