diff options
| author | Thomas Tsou <ttsou@vt.edu> | 2010-08-26 12:34:06 -0700 |
|---|---|---|
| committer | Thomas Tsou <ttsou@vt.edu> | 2010-08-26 12:34:06 -0700 |
| commit | af44e589a2ed47f08fa060629b33e441fb2dc4ea (patch) | |
| tree | ad970811fc253d03400ee70a41e96066e8cd7b6f /host/lib/usrp/dboard | |
| parent | 4434e8233fadc4eec81d345a6c4e63922d8c01ab (diff) | |
| parent | 738f4a86558aca8d2fdfecd480613766bfc82510 (diff) | |
| download | uhd-af44e589a2ed47f08fa060629b33e441fb2dc4ea.tar.gz uhd-af44e589a2ed47f08fa060629b33e441fb2dc4ea.tar.bz2 uhd-af44e589a2ed47f08fa060629b33e441fb2dc4ea.zip | |
Merge branch 'convert_types' into usrp1
Diffstat (limited to 'host/lib/usrp/dboard')
| -rw-r--r-- | host/lib/usrp/dboard/db_basic_and_lf.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp index f8236d598..0b6e4a75a 100644 --- a/host/lib/usrp/dboard/db_basic_and_lf.cpp +++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp @@ -170,8 +170,8 @@ void basic_rx::rx_set(const wax::obj &key_, const wax::obj &val){ return; case SUBDEV_PROP_ANTENNA: - UHD_ASSERT_THROW(val.as<std::string>() == std::string("")); - return; + if (val.as<std::string>().empty()) return; + throw std::runtime_error("no selectable antennas on this board"); case SUBDEV_PROP_FREQ: return; // it wont do you much good, but you can set it @@ -259,8 +259,8 @@ void basic_tx::tx_set(const wax::obj &key_, const wax::obj &val){ return; case SUBDEV_PROP_ANTENNA: - UHD_ASSERT_THROW(val.as<std::string>() == std::string("")); - return; + if (val.as<std::string>().empty()) return; + throw std::runtime_error("no selectable antennas on this board"); case SUBDEV_PROP_FREQ: return; // it wont do you much good, but you can set it |