diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-28 11:10:50 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-28 11:10:50 -0700 |
| commit | cbd9e1da0866893d86320787a99cf4257478c539 (patch) | |
| tree | 0b2515cd96d9c341795b91efed25df0616ea821c /host/lib/device.cpp | |
| parent | f5b6776a0b642c0357fbecdead9d2b1ac6ece3d3 (diff) | |
| parent | 8497eb2ac016f72e2b9a9028e5126bc73f5b0c9a (diff) | |
| download | uhd-cbd9e1da0866893d86320787a99cf4257478c539.tar.gz uhd-cbd9e1da0866893d86320787a99cf4257478c539.tar.bz2 uhd-cbd9e1da0866893d86320787a99cf4257478c539.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/device.cpp')
| -rw-r--r-- | host/lib/device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/device.cpp b/host/lib/device.cpp index 0197a6232..706f64951 100644 --- a/host/lib/device.cpp +++ b/host/lib/device.cpp @@ -132,8 +132,8 @@ device::sptr device::make(const device_addr_t &hint, size_t which){ //try to find an existing device try{ - ASSERT_THROW(hash_to_device.has_key(dev_hash)); - ASSERT_THROW(not hash_to_device[dev_hash].expired()); + UHD_ASSERT_THROW(hash_to_device.has_key(dev_hash)); + UHD_ASSERT_THROW(not hash_to_device[dev_hash].expired()); return hash_to_device[dev_hash].lock(); } //create and register a new device |