diff options
| author | Josh Blum <josh@joshknows.com> | 2011-08-31 15:51:23 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-08-31 15:51:23 -0700 |
| commit | 92735f83fcbf27beda59bea02653bce10782bb44 (patch) | |
| tree | 35a72f044c1cd5151fea96b863633104643dd383 | |
| parent | 2be84d2d68c3b8ea3fc150bec9159ed3fae227fd (diff) | |
| download | uhd-92735f83fcbf27beda59bea02653bce10782bb44.tar.gz uhd-92735f83fcbf27beda59bea02653bce10782bb44.tar.bz2 uhd-92735f83fcbf27beda59bea02653bce10782bb44.zip | |
usrp2: made iface deconstructor safe (unlock can throw)
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index aaa5acbd5..d91dd0e40 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -21,6 +21,7 @@ #include <uhd/exception.hpp> #include <uhd/utils/msg.hpp> #include <uhd/utils/tasks.hpp> +#include <uhd/utils/safe_call.hpp> #include <uhd/types/dict.hpp> #include <boost/thread.hpp> #include <boost/foreach.hpp> @@ -96,9 +97,9 @@ public: mb_eeprom = mboard_eeprom_t(*this, mboard_eeprom_t::MAP_N100); } - ~usrp2_iface_impl(void){ + ~usrp2_iface_impl(void){UHD_SAFE_CALL( this->lock_device(false); - } + )} /*********************************************************************** * Device locking |