diff options
author | Philip Balister <philip@opensdr.com> | 2010-04-27 08:21:35 +0000 |
---|---|---|
committer | Philip Balister <philip@opensdr.com> | 2010-04-27 08:21:35 +0000 |
commit | 7dba88b257f6a0fd5c35677ed5c7ce577cebbc74 (patch) | |
tree | 3b44059774229d69fe521cbf035758115493c4ce /host/lib/usrp/usrp_e/usrp_e_impl.cpp | |
parent | 245b46da0b603e3c12c56fdad782ff884b2a6432 (diff) | |
parent | 1c4e9bd614dc8b7a17dc2bd95c322bbea940ca35 (diff) | |
download | uhd-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/usrp/usrp_e/usrp_e_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp_e/usrp_e_impl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp_e/usrp_e_impl.cpp b/host/lib/usrp/usrp_e/usrp_e_impl.cpp index 4d08210e2..211b939ee 100644 --- a/host/lib/usrp/usrp_e/usrp_e_impl.cpp +++ b/host/lib/usrp/usrp_e/usrp_e_impl.cpp @@ -112,7 +112,7 @@ void usrp_e_impl::get(const wax::obj &key_, wax::obj &val){ return; case DEVICE_PROP_MBOARD: - ASSERT_THROW(name == ""); + UHD_ASSERT_THROW(name == ""); val = _mboard_proxy->get_link(); return; @@ -128,6 +128,7 @@ void usrp_e_impl::get(const wax::obj &key_, wax::obj &val){ val = size_t(_max_num_samples); return; + default: UHD_THROW_PROP_GET_ERROR(); } } @@ -135,7 +136,7 @@ void usrp_e_impl::get(const wax::obj &key_, wax::obj &val){ * Device Set **********************************************************************/ void usrp_e_impl::set(const wax::obj &, const wax::obj &){ - throw std::runtime_error("Cannot set in usrp-e device"); + UHD_THROW_PROP_SET_ERROR(); } /*********************************************************************** |