hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

uhd: Fixed multiple compiler warnings (unused variables, missing literal f)

Browse Source
This commit is contained in:
Martin Braun 2015-03-11 16:14:00 -07:00
parent eed305afee
commit fae746179c
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host/include/uhd/utils/math.hpp
View File

@ -60,7 +60,7 @@ namespace math {
* values, a custom epsilon should be defined for those computations. This
* use-case is provided for in the `fp_compare_epsilon` class constructor.
*/
static const float SINGLE_PRECISION_EPSILON = 1.19e-7;
static const float SINGLE_PRECISION_EPSILON = 1.19e-7f;
static const double DOUBLE_PRECISION_EPSILON = 2.22e-16;
namespace fp_compare {

2
host/lib/usrp/b200/b200_impl.cpp
View File

@ -1007,6 +1007,6 @@ sensor_value_t b200_impl::get_ref_locked(void)
sensor_value_t b200_impl::get_fe_pll_locked(const bool is_tx)
{
const boost::uint32_t st = _local_ctrl->peek32(RB32_CORE_PLL);
const bool locked = is_tx ? st & 0x1 : st & 0x2;
const bool locked = is_tx ? bool(st & 0x1) : bool(st & 0x2);
return sensor_value_t("LO", locked, "locked", "unlocked");
}

2
host/lib/usrp/dboard/db_ubx.cpp
View File

@ -84,7 +84,7 @@ protected:
// Get only regs with changes
try {
changed_regs = get_changed_addrs();
} catch (uhd::runtime_error& e) {
} catch (uhd::runtime_error&) {
// No saved state - write all regs
for (int addr = 5; addr >= 0; addr--)
changed_regs.insert(boost::uint32_t(addr));

12
host/lib/usrp/multi_usrp.cpp
View File

@ -823,7 +823,7 @@ public:
void set_rx_gain(double gain, const std::string &name, size_t chan){
try {
return rx_gain_group(chan)->set_value(gain, name);
} catch (uhd::key_error &e) {
} catch (uhd::key_error &) {
THROW_GAIN_NAME_ERROR(name,chan,rx);
}
}
@ -831,7 +831,7 @@ public:
double get_rx_gain(const std::string &name, size_t chan){
try {
return rx_gain_group(chan)->get_value(name);
} catch (uhd::key_error &e) {
} catch (uhd::key_error &) {
THROW_GAIN_NAME_ERROR(name,chan,rx);
}
}
@ -839,7 +839,7 @@ public:
gain_range_t get_rx_gain_range(const std::string &name, size_t chan){
try {
return rx_gain_group(chan)->get_range(name);
} catch (uhd::key_error &e) {
} catch (uhd::key_error &) {
THROW_GAIN_NAME_ERROR(name,chan,rx);
}
}
@ -1024,7 +1024,7 @@ public:
void set_tx_gain(double gain, const std::string &name, size_t chan){
try {
return tx_gain_group(chan)->set_value(gain, name);
} catch (uhd::key_error &e) {
} catch (uhd::key_error &) {
THROW_GAIN_NAME_ERROR(name,chan,tx);
}
}
@ -1032,7 +1032,7 @@ public:
double get_tx_gain(const std::string &name, size_t chan){
try {
return tx_gain_group(chan)->get_value(name);
} catch (uhd::key_error &e) {
} catch (uhd::key_error &) {
THROW_GAIN_NAME_ERROR(name,chan,tx);
}
}
@ -1040,7 +1040,7 @@ public:
gain_range_t get_tx_gain_range(const std::string &name, size_t chan){
try {
return tx_gain_group(chan)->get_range(name);
} catch (uhd::key_error &e) {
} catch (uhd::key_error &) {
THROW_GAIN_NAME_ERROR(name,chan,tx);
}
}

2
host/lib/usrp_clock/octoclock/octoclock_impl.cpp
View File

@ -417,7 +417,7 @@ std::string octoclock_impl::_get_images_help_message(const std::string &addr){
try{
image_location = uhd::find_image_path(image_name);
}
catch(const std::exception &e){
catch(const std::exception &){
return str(boost::format("Could not find %s in your images path.\n%s")
% image_name
% uhd::print_utility_error("uhd_images_downloader.py"));

4
host/utils/b2xx_fx3_utils.cpp
View File

@ -173,7 +173,7 @@ uhd::transport::usb_device_handle::sptr open_device(const boost::uint16_t vid, c
if (!handle)
std::cerr << "Cannot open device" << std::endl;
}
catch(const std::exception &e) {
catch(const std::exception &) {
std::cerr << "Failed to communicate with the device!" << std::endl;
#ifdef UHD_PLATFORM_WIN32
std::cerr << "The necessary drivers are not installed. Read the UHD Transport Application Notes for details:\nhttp://files.ettus.com/manual/page_transport.html" << std::endl;
@ -195,7 +195,7 @@ b200_iface::sptr make_b200_iface(const uhd::transport::usb_device_handle::sptr &
if (!b200)
std::cerr << "Cannot create device interface" << std::endl;
}
catch(const std::exception &e) {
catch(const std::exception &) {
std::cerr << "Failed to communicate with the device!" << std::endl;
#ifdef UHD_PLATFORM_WIN32
std::cerr << "The necessary drivers are not installed. Read the UHD Transport Application Notes for details:\nhttp://files.ettus.com/manual/page_transport.html" << std::endl;

2
host/utils/query_gpsdo_sensors.cpp
View File

@ -118,7 +118,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
uhd::sensor_value_t rmc_string = usrp->get_mboard_sensor("gps_gprmc");
std::cout << boost::format("Printing available NMEA strings:\n");
std::cout << boost::format("%s\n%s\n%s\n") % gga_string.to_pp_string() % rmc_string.to_pp_string() % gps_time.to_pp_string();
} catch (std::exception &e) {
} catch (std::exception &) {
std::cout << "NMEA strings not implemented for this device." << std::endl;
}
std::cout << boost::format("UHD Device time: %.0f seconds\n") % (last_pps_time.get_real_secs());