diff options
| author | michael-west <michael.west@ettus.com> | 2014-03-25 15:59:03 -0700 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2014-03-25 15:59:03 -0700 |
| commit | 04292f9b109479b639add31f83fd240a6387f488 (patch) | |
| tree | 4b8723a4ae63626029704f901ee0083bb23bc1e9 /host/utils/b2xx_fx3_utils.cpp | |
| parent | 09915aa57bc88099cbcbbe925946ae65bc0ad8f0 (diff) | |
| parent | ff8a1252f3a51369abe0a165d963b781089ec66c (diff) | |
| download | uhd-04292f9b109479b639add31f83fd240a6387f488.tar.gz uhd-04292f9b109479b639add31f83fd240a6387f488.tar.bz2 uhd-04292f9b109479b639add31f83fd240a6387f488.zip | |
Merge branch 'master' into mwest/b200_docs
Diffstat (limited to 'host/utils/b2xx_fx3_utils.cpp')
| -rw-r--r-- | host/utils/b2xx_fx3_utils.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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 <class T> 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<to_hex<boost::uint16_t> >(string); + std::stringstream interpreter(string); + to_hex<boost::uint16_t> hh; + interpreter >> hh; + return hh.value; } return boost::lexical_cast<boost::uint16_t>(string); } |