diff options
| author | Josh Blum <josh@joshknows.com> | 2011-11-07 16:53:47 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-11-07 16:53:47 -0800 |
| commit | 902818f50bbd486138a7d4cd2ce9ba3661f4a732 (patch) | |
| tree | cec3681c04d5acc3e74924e4c255f1ea81201d81 /host/lib/usrp | |
| parent | 9d4350d74ea926999780ded0016c5ad51874ebec (diff) | |
| download | uhd-902818f50bbd486138a7d4cd2ce9ba3661f4a732.tar.gz uhd-902818f50bbd486138a7d4cd2ce9ba3661f4a732.tar.bz2 uhd-902818f50bbd486138a7d4cd2ce9ba3661f4a732.zip | |
uhd: removed wax and props utils
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/dboard/db_wbx_common.hpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_wbx_simple.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/gps_ctrl.cpp | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/host/lib/usrp/dboard/db_wbx_common.hpp b/host/lib/usrp/dboard/db_wbx_common.hpp index 3e41e04b7..e7eb3f31a 100644 --- a/host/lib/usrp/dboard/db_wbx_common.hpp +++ b/host/lib/usrp/dboard/db_wbx_common.hpp @@ -69,7 +69,6 @@ #include <uhd/types/ranges.hpp> #include <uhd/types/sensors.hpp> #include <uhd/utils/log.hpp> -#include <uhd/utils/props.hpp> #include <uhd/utils/static.hpp> #include <uhd/usrp/dboard_base.hpp> #include <boost/assign/list_of.hpp> diff --git a/host/lib/usrp/dboard/db_wbx_simple.cpp b/host/lib/usrp/dboard/db_wbx_simple.cpp index 1ac2a1704..f46ea70d1 100644 --- a/host/lib/usrp/dboard/db_wbx_simple.cpp +++ b/host/lib/usrp/dboard/db_wbx_simple.cpp @@ -36,9 +36,9 @@ using namespace boost::assign; /*********************************************************************** * The WBX Simple dboard constants **********************************************************************/ -static const prop_names_t wbx_tx_antennas = list_of("TX/RX"); +static const std::vector<std::string> wbx_tx_antennas = list_of("TX/RX"); -static const prop_names_t wbx_rx_antennas = list_of("TX/RX")("RX2"); +static const std::vector<std::string> wbx_rx_antennas = list_of("TX/RX")("RX2"); /*********************************************************************** * The WBX simple implementation diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp index c645d2948..45fa1f39e 100644 --- a/host/lib/usrp/gps_ctrl.cpp +++ b/host/lib/usrp/gps_ctrl.cpp @@ -17,7 +17,6 @@ #include <uhd/usrp/gps_ctrl.hpp> #include <uhd/utils/msg.hpp> -#include <uhd/utils/props.hpp> #include <uhd/exception.hpp> #include <uhd/types/sensors.hpp> #include <boost/algorithm/string.hpp> @@ -121,7 +120,7 @@ public: return sensor_value_t("GPS lock status", locked(), "locked", "unlocked"); } else { - UHD_THROW_PROP_GET_ERROR(); + throw uhd::value_error("gps ctrl get_sensor unknown key: " + key); } } |