diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-24 14:54:24 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-24 14:54:24 -0800 |
| commit | 16f08844d7b6ccbdcfdf17963b88cadb7525ddc6 (patch) | |
| tree | 802a4e5558706155d7231ccb8f64b44b1cd67599 /host/lib/usrp/usrp_e100/codec_ctrl.cpp | |
| parent | 20a524d1a00497bdffda0292143d92e4d98cfbe9 (diff) | |
| download | uhd-16f08844d7b6ccbdcfdf17963b88cadb7525ddc6.tar.gz uhd-16f08844d7b6ccbdcfdf17963b88cadb7525ddc6.tar.bz2 uhd-16f08844d7b6ccbdcfdf17963b88cadb7525ddc6.zip | |
uhd: renamed the assert header to assert has
only the assert has implementation is in this header
uhd assert throw moved to the exception header
updated code base includes to match
Diffstat (limited to 'host/lib/usrp/usrp_e100/codec_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp_e100/codec_ctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp_e100/codec_ctrl.cpp b/host/lib/usrp/usrp_e100/codec_ctrl.cpp index b33c8ae65..b5671072c 100644 --- a/host/lib/usrp/usrp_e100/codec_ctrl.cpp +++ b/host/lib/usrp/usrp_e100/codec_ctrl.cpp @@ -18,7 +18,7 @@ #include "codec_ctrl.hpp" #include "ad9862_regs.hpp" #include <uhd/types/dict.hpp> -#include <uhd/utils/assert.hpp> +#include <uhd/exception.hpp> #include <uhd/utils/algorithm.hpp> #include <boost/cstdint.hpp> #include <boost/tuple/tuple.hpp> @@ -227,7 +227,7 @@ double usrp_e100_codec_ctrl_impl::read_aux_adc(aux_adc_t which){ case AUX_ADC_B1: return aux_adc_to_volts(_ad9862_regs.aux_adc_b1_9_2, _ad9862_regs.aux_adc_b1_1_0); case AUX_ADC_B2: return aux_adc_to_volts(_ad9862_regs.aux_adc_b2_9_2, _ad9862_regs.aux_adc_b2_1_0); } - UHD_ASSERT_THROW(false); + UHD_THROW_INVALID_CODE_PATH(); } /*********************************************************************** |