diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:35:27 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:35:27 -0700 |
| commit | 88ffeb35dadb3d10593be39c9eae2f90c4d7c008 (patch) | |
| tree | 4dc3fb96097260c3eb46e45ebba39c17efb3af7a /host/utils/usrp_n2xx_simple_net_burner.cpp | |
| parent | 5b285598d367b936caf91b615e30e90af8af2a5d (diff) | |
| parent | 1200721b696751edaceb70a332861f84fb8c16d5 (diff) | |
| download | uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.tar.gz uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.tar.bz2 uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.zip | |
Merge branch 'maint'
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)); |