diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-03-30 16:56:01 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-03-30 16:56:01 -0700 |
| commit | 700bf99bdc483fdcc9deb54abc29bd7f81e16089 (patch) | |
| tree | 42d4f30e7a4abc9e47dcd01300a2f44ab1b91510 /host/utils/usrp_n2xx_simple_net_burner.cpp | |
| parent | 6a34824ad10eaa2d2b642b959f278f6c4e326d6d (diff) | |
| parent | 61599b3eaadcc46ac8d24974176d7fd89778d06e (diff) | |
| download | uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.tar.gz uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.tar.bz2 uhd-700bf99bdc483fdcc9deb54abc29bd7f81e16089.zip | |
Merge branch 'master' into ashish/vivado
Diffstat (limited to 'host/utils/usrp_n2xx_simple_net_burner.cpp')
| -rw-r--r-- | host/utils/usrp_n2xx_simple_net_burner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/utils/usrp_n2xx_simple_net_burner.cpp b/host/utils/usrp_n2xx_simple_net_burner.cpp index b06e67bb2..642e9a407 100644 --- a/host/utils/usrp_n2xx_simple_net_burner.cpp +++ b/host/utils/usrp_n2xx_simple_net_burner.cpp @@ -262,7 +262,7 @@ int read_fpga_image(std::string& fpga_path){ //Check size of given image std::ifstream fpga_file(fpga_path.c_str(), std::ios::binary); fpga_file.seekg(0, std::ios::end); - int fpga_image_size = fpga_file.tellg(); + size_t fpga_image_size = size_t(fpga_file.tellg()); if(fpga_image_size > FPGA_IMAGE_SIZE_BYTES){ throw std::runtime_error(str(boost::format("FPGA image is too large. %d > %d") % fpga_image_size % FPGA_IMAGE_SIZE_BYTES)); @@ -297,7 +297,7 @@ int read_fw_image(std::string& fw_path){ //Check size of given image std::ifstream fw_file(fw_path.c_str(), std::ios::binary); fw_file.seekg(0, std::ios::end); - int fw_image_size = fw_file.tellg(); + size_t fw_image_size = size_t(fw_file.tellg()); if(fw_image_size > FW_IMAGE_SIZE_BYTES){ throw std::runtime_error(str(boost::format("Firmware image is too large. %d > %d") % fw_image_size % FW_IMAGE_SIZE_BYTES)); |