diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2016-03-04 10:32:32 -0800 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2016-03-04 10:32:32 -0800 |
| commit | e4792b00c88103bba9239bb5cabb10b95c4ae531 (patch) | |
| tree | e28d9c82bcc8bbcf57dc453dc305b9dbcb893514 | |
| parent | 7b268bdb82959dd1df3657697dc26594b1ffd2d6 (diff) | |
| download | uhd-e4792b00c88103bba9239bb5cabb10b95c4ae531.tar.gz uhd-e4792b00c88103bba9239bb5cabb10b95c4ae531.tar.bz2 uhd-e4792b00c88103bba9239bb5cabb10b95c4ae531.zip | |
Fixed minor warnings:
* nirio_driver_iface_win: labeled unused variable for MinGW builds
* b200_impl: fixed unreferenced variable warning
* n200_image_loader: fixed signed vs. unsigned comparison
| -rw-r--r-- | host/lib/transport/nirio/nirio_driver_iface_win.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/n200_image_loader.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/transport/nirio/nirio_driver_iface_win.cpp b/host/lib/transport/nirio/nirio_driver_iface_win.cpp index 717923176..c8484e953 100644 --- a/host/lib/transport/nirio/nirio_driver_iface_win.cpp +++ b/host/lib/transport/nirio/nirio_driver_iface_win.cpp @@ -1,5 +1,5 @@ // -// Copyright 2013,2015 Ettus Research LLC +// Copyright 2013,2015-2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -66,7 +66,7 @@ nirio_status rio_ioctl( read_buf, static_cast<DWORD>(read_buf_len), &outLen, &zeroedOverlapped ))) { - int_fast32_t lastError = GetLastError(); + UHD_UNUSED(int_fast32_t lastError) = GetLastError(); return NiRio_Status_SoftwareFault; } diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 200d99aee..18dcdadba 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -348,7 +348,7 @@ b200_impl::b200_impl(const uhd::device_addr_t& device_addr, usb_device_handle::s handle = dev_handle; break; } - } catch (const uhd::exception &e) { continue; } + } catch (const uhd::exception&) { continue; } } UHD_ASSERT_THROW(handle.get() != NULL); //better be found diff --git a/host/lib/usrp/usrp2/n200_image_loader.cpp b/host/lib/usrp/usrp2/n200_image_loader.cpp index 29bec8b4a..d6acfe39d 100644 --- a/host/lib/usrp/usrp2/n200_image_loader.cpp +++ b/host/lib/usrp/usrp2/n200_image_loader.cpp @@ -1,5 +1,5 @@ // -// Copyright 2015 Ettus Research LLC +// Copyright 2015-2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -201,7 +201,7 @@ static UHD_INLINE bool n200_response_matches(const n200_fw_update_data_t *pkt_in n200_fw_update_id_t pkt_code, size_t len){ return (len > offsetof(n200_fw_update_data_t, data) and - ntohl(pkt_in->id) == pkt_code); + ntohl(pkt_in->id) == (unsigned)pkt_code); } static uhd::device_addr_t n200_find(const image_loader::image_loader_args_t &image_loader_args){ |