diff options
author | Josh Blum <josh@joshknows.com> | 2011-07-22 01:19:03 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-07-22 13:59:47 -0700 |
commit | da40a1aebc16ca05219883c18b2cf96989c470fd (patch) | |
tree | 24d3c902b2d5795755be3171388fef81a0da3a7a /host/utils | |
parent | 833b5369378d5788dd430451803bf36a96dc3901 (diff) | |
download | uhd-da40a1aebc16ca05219883c18b2cf96989c470fd.tar.gz uhd-da40a1aebc16ca05219883c18b2cf96989c470fd.tar.bz2 uhd-da40a1aebc16ca05219883c18b2cf96989c470fd.zip |
uhd: replaced boost filesystem path with fs_path in property tree
Diffstat (limited to 'host/utils')
-rw-r--r-- | host/utils/uhd_usrp_probe.cpp | 12 | ||||
-rw-r--r-- | host/utils/usrp_burn_db_eeprom.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/host/utils/uhd_usrp_probe.cpp b/host/utils/uhd_usrp_probe.cpp index 6c5f451cd..55b9e3ddd 100644 --- a/host/utils/uhd_usrp_probe.cpp +++ b/host/utils/uhd_usrp_probe.cpp @@ -51,7 +51,7 @@ static std::string make_border(const std::string &text){ return ss.str(); } -static std::string get_dsp_pp_string(const std::string &type, property_tree::sptr tree, const property_tree::path_type &path){ +static std::string get_dsp_pp_string(const std::string &type, property_tree::sptr tree, const fs_path &path){ std::stringstream ss; ss << boost::format("%s DSP: %s") % type % path.leaf() << std::endl; //ss << std::endl; @@ -68,7 +68,7 @@ static std::string prop_names_to_pp_string(const std::vector<std::string> &prop_ return ss.str(); } -static std::string get_subdev_pp_string(const std::string &type, property_tree::sptr tree, const property_tree::path_type &path){ +static std::string get_subdev_pp_string(const std::string &type, property_tree::sptr tree, const fs_path &path){ std::stringstream ss; ss << boost::format("%s Subdev: %s") % type % path.leaf() << std::endl; //ss << std::endl; @@ -93,7 +93,7 @@ static std::string get_subdev_pp_string(const std::string &type, property_tree:: return ss.str(); } -static std::string get_codec_pp_string(const std::string &type, property_tree::sptr tree, const property_tree::path_type &path){ +static std::string get_codec_pp_string(const std::string &type, property_tree::sptr tree, const fs_path &path){ std::stringstream ss; ss << boost::format("%s Codec: %s") % type % path.leaf() << std::endl; //ss << std::endl; @@ -108,7 +108,7 @@ static std::string get_codec_pp_string(const std::string &type, property_tree::s return ss.str(); } -static std::string get_dboard_pp_string(const std::string &type, property_tree::sptr tree, const property_tree::path_type &path){ +static std::string get_dboard_pp_string(const std::string &type, property_tree::sptr tree, const fs_path &path){ std::stringstream ss; ss << boost::format("%s Dboard: %s") % type % path.leaf() << std::endl; //ss << std::endl; @@ -128,7 +128,7 @@ static std::string get_dboard_pp_string(const std::string &type, property_tree:: return ss.str(); } -static std::string get_mboard_pp_string(property_tree::sptr tree, const property_tree::path_type &path){ +static std::string get_mboard_pp_string(property_tree::sptr tree, const fs_path &path){ std::stringstream ss; ss << boost::format("Mboard: %s") % (tree->access<std::string>(path / "name").get()) << std::endl; //ss << std::endl; @@ -166,7 +166,7 @@ static std::string get_device_pp_string(property_tree::sptr tree){ return ss.str(); } -void print_tree(const uhd::property_tree::path_type &path, uhd::property_tree::sptr tree){ +void print_tree(const uhd::fs_path &path, uhd::property_tree::sptr tree){ std::cout << path << std::endl; BOOST_FOREACH(const std::string &name, tree->list(path)){ print_tree(path / name, tree); diff --git a/host/utils/usrp_burn_db_eeprom.cpp b/host/utils/usrp_burn_db_eeprom.cpp index 9dfce141b..253b73262 100644 --- a/host/utils/usrp_burn_db_eeprom.cpp +++ b/host/utils/usrp_burn_db_eeprom.cpp @@ -63,14 +63,14 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //make the device and extract the dboard w/ property device::sptr dev = device::make(args); uhd::property_tree::sptr tree = dev->get_tree(); - const uhd::property_tree::path_type db_root = "/mboards/0/dboards"; + const uhd::fs_path db_root = "/mboards/0/dboards"; std::vector<std::string> dboard_names = tree->list(db_root); if (dboard_names.size() == 1 and slot.empty()) slot = dboard_names.front(); uhd::assert_has(dboard_names, slot, "dboard slot name"); std::cout << boost::format("Reading %s EEPROM on %s dboard...") % unit % slot << std::endl; boost::to_lower(unit); - const uhd::property_tree::path_type db_path = db_root / slot / (unit + "_eeprom"); + const uhd::fs_path db_path = db_root / slot / (unit + "_eeprom"); dboard_eeprom_t db_eeprom = tree->access<dboard_eeprom_t>(db_path).get(); //------------- handle the dboard ID -----------------------------// |