From 3edead271655316826864ebb8a0d9d529402f31f Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Mon, 27 Jan 2014 11:14:54 -0800 Subject: Brought in UHD 3.6.2 MacPorts patches for OS X compatibility * With OS X, boost::lexical_cast won't accept to_hex as a type --- host/lib/usrp/dboard_id.cpp | 7 +++++-- host/utils/b2xx_fx3_utils.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/host/lib/usrp/dboard_id.cpp b/host/lib/usrp/dboard_id.cpp index 3028d2a3b..557e13914 100644 --- a/host/lib/usrp/dboard_id.cpp +++ b/host/lib/usrp/dboard_id.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010 Ettus Research LLC +// Copyright 2010,2014 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 @@ -51,7 +51,10 @@ template struct to_hex{ dboard_id_t dboard_id_t::from_string(const std::string &string){ if (string.substr(0, 2) == "0x"){ - return dboard_id_t::from_uint16(boost::lexical_cast >(string)); + std::stringstream interpreter(string); + to_hex hh; + interpreter >> hh; + return dboard_id_t::from_uint16(hh); } return dboard_id_t::from_uint16(boost::lexical_cast(string)); } diff --git a/host/utils/b2xx_fx3_utils.cpp b/host/utils/b2xx_fx3_utils.cpp index 96cd1f3e7..d5f829c80 100644 --- a/host/utils/b2xx_fx3_utils.cpp +++ b/host/utils/b2xx_fx3_utils.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2013 Ettus Research LLC +// Copyright 2010-2014 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 @@ -79,7 +79,10 @@ template struct to_hex{ //!parse hex-formatted ASCII text into an int boost::uint16_t atoh(const std::string &string){ if (string.substr(0, 2) == "0x"){ - return boost::lexical_cast >(string); + std::stringstream interpreter(string); + to_hex hh; + interpreter >> hh; + return hh.value; } return boost::lexical_cast(string); } -- cgit v1.2.3