aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/device.cpp
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2010-04-27 08:21:35 +0000
committerPhilip Balister <philip@opensdr.com>2010-04-27 08:21:35 +0000
commit7dba88b257f6a0fd5c35677ed5c7ce577cebbc74 (patch)
tree3b44059774229d69fe521cbf035758115493c4ce /host/lib/device.cpp
parent245b46da0b603e3c12c56fdad782ff884b2a6432 (diff)
parent1c4e9bd614dc8b7a17dc2bd95c322bbea940ca35 (diff)
downloaduhd-7dba88b257f6a0fd5c35677ed5c7ce577cebbc74.tar.gz
uhd-7dba88b257f6a0fd5c35677ed5c7ce577cebbc74.tar.bz2
uhd-7dba88b257f6a0fd5c35677ed5c7ce577cebbc74.zip
Merge branch 'usrp_e' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/device.cpp')
-rw-r--r--host/lib/device.cpp4
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