diff options
author | Josh Blum <josh@joshknows.com> | 2010-04-26 14:42:32 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-04-26 14:42:32 -0700 |
commit | 90ed2e3a80eef0be3a7270364335f0e82f004cc1 (patch) | |
tree | 1db6d92ba1c5c4086d23e1e19528ce43e778b549 /host/lib/usrp/usrp2/dboard_impl.cpp | |
parent | f040d79d256bcdfcd931ab93e00b66f6af881a14 (diff) | |
download | uhd-90ed2e3a80eef0be3a7270364335f0e82f004cc1.tar.gz uhd-90ed2e3a80eef0be3a7270364335f0e82f004cc1.tar.bz2 uhd-90ed2e3a80eef0be3a7270364335f0e82f004cc1.zip |
prefixed the ASSERT_THROW macro with UHD for the sake of namespace
Diffstat (limited to 'host/lib/usrp/usrp2/dboard_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/dboard_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp index a68ae240e..226a7950d 100644 --- a/host/lib/usrp/usrp2/dboard_impl.cpp +++ b/host/lib/usrp/usrp2/dboard_impl.cpp @@ -66,7 +66,7 @@ void usrp2_impl::dboard_init(void){ void usrp2_impl::update_rx_mux_config(void){ //calculate the rx mux boost::uint32_t rx_mux = 0; - ASSERT_THROW(_rx_subdevs_in_use.size() == 1); + UHD_ASSERT_THROW(_rx_subdevs_in_use.size() == 1); wax::obj rx_subdev = _dboard_manager->get_rx_subdev(_rx_subdevs_in_use.at(0)); std::cout << "Using: " << rx_subdev[SUBDEV_PROP_NAME].as<std::string>() << std::endl; if (rx_subdev[SUBDEV_PROP_QUADRATURE].as<bool>()){ @@ -84,7 +84,7 @@ void usrp2_impl::update_rx_mux_config(void){ void usrp2_impl::update_tx_mux_config(void){ //calculate the tx mux boost::uint32_t tx_mux = 0x10; - ASSERT_THROW(_tx_subdevs_in_use.size() == 1); + UHD_ASSERT_THROW(_tx_subdevs_in_use.size() == 1); wax::obj tx_subdev = _dboard_manager->get_tx_subdev(_tx_subdevs_in_use.at(0)); std::cout << "Using: " << tx_subdev[SUBDEV_PROP_NAME].as<std::string>() << std::endl; if (tx_subdev[SUBDEV_PROP_IQ_SWAPPED].as<bool>()){ |