aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2/usrp2_iface.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-02-24 16:35:29 -0800
committerJosh Blum <josh@joshknows.com>2011-02-24 16:35:29 -0800
commit4357f5d3c043245b5c086b20742795624af9f432 (patch)
tree7a3cfc9f5b3ffc285ecd611655d741355dcb39b8 /host/lib/usrp/usrp2/usrp2_iface.cpp
parent16f08844d7b6ccbdcfdf17963b88cadb7525ddc6 (diff)
downloaduhd-4357f5d3c043245b5c086b20742795624af9f432.tar.gz
uhd-4357f5d3c043245b5c086b20742795624af9f432.tar.bz2
uhd-4357f5d3c043245b5c086b20742795624af9f432.zip
uhd: replaced instanced of std::exception with the uhd exceptions
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.cpp')
-rw-r--r--host/lib/usrp/usrp2/usrp2_iface.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index 462ebab16..3a7ed8351 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -25,7 +25,6 @@
#include <boost/assign/list_of.hpp>
#include <boost/format.hpp>
#include <boost/tokenizer.hpp>
-#include <stdexcept>
#include <algorithm>
using namespace uhd;
@@ -63,7 +62,7 @@ public:
//check the fpga compatibility number
const boost::uint32_t fpga_compat_num = this->peek32(this->regs.compat_num_rb);
if (fpga_compat_num != USRP2_FPGA_COMPAT_NUM){
- throw std::runtime_error(str(boost::format(
+ throw uhd::runtime_error(str(boost::format(
"Expected fpga compatibility number %d, but got %d:\n"
"The fpga build is not compatible with the host code build."
) % int(USRP2_FPGA_COMPAT_NUM) % fpga_compat_num));
@@ -245,7 +244,7 @@ public:
while(true){
size_t len = _ctrl_transport->recv(boost::asio::buffer(usrp2_ctrl_data_in_mem), CTRL_RECV_TIMEOUT);
if(len >= sizeof(boost::uint32_t) and ntohl(ctrl_data_in->proto_ver) != USRP2_FW_COMPAT_NUM){
- throw std::runtime_error(str(boost::format(
+ throw uhd::runtime_error(str(boost::format(
"Expected protocol compatibility number %d, but got %d:\n"
"The firmware build is not compatible with the host code build."
) % int(USRP2_FW_COMPAT_NUM) % ntohl(ctrl_data_in->proto_ver)));
@@ -256,7 +255,7 @@ public:
if (len == 0) break; //timeout
//didnt get seq or bad packet, continue looking...
}
- throw std::runtime_error("no control response");
+ throw uhd::runtime_error("no control response");
}
rev_type get_rev(void){