diff options
author | Josh Blum <josh@joshknows.com> | 2011-03-15 18:21:59 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-03-15 18:21:59 -0700 |
commit | 0d0d03d08d13037da2f2f1c85e546addff32aa69 (patch) | |
tree | 0e5b823c84f4d00b7c77d07d42be45d24de57362 | |
parent | 3a1ad3f13c41a448083100ada6d4162a0092ee58 (diff) | |
download | uhd-0d0d03d08d13037da2f2f1c85e546addff32aa69.tar.gz uhd-0d0d03d08d13037da2f2f1c85e546addff32aa69.tar.bz2 uhd-0d0d03d08d13037da2f2f1c85e546addff32aa69.zip |
uhd: replace file_string() with string() for deprecation reasons
Patch from moritz.fischer@student.kit.edu
[1] http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/deprecated.html
[2] http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/index.htm
Boost 1.36 appears to have string(), so this should be safe to use.
-rw-r--r-- | host/lib/usrp/usrp_e100/usrp_e100_impl.cpp | 2 | ||||
-rw-r--r-- | host/lib/utils/images.cpp | 4 | ||||
-rw-r--r-- | host/lib/utils/load_modules.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_impl.cpp b/host/lib/usrp/usrp_e100/usrp_e100_impl.cpp index 40ea56466..f430090f0 100644 --- a/host/lib/usrp/usrp_e100/usrp_e100_impl.cpp +++ b/host/lib/usrp/usrp_e100/usrp_e100_impl.cpp @@ -53,7 +53,7 @@ static device_addrs_t usrp_e100_find(const device_addr_t &hint){ if (fs::exists(hint["node"])){ device_addr_t new_addr; new_addr["type"] = "usrp-e"; - new_addr["node"] = fs::system_complete(fs::path(hint["node"])).file_string(); + new_addr["node"] = fs::system_complete(fs::path(hint["node"])).string(); try{ usrp_e100_iface::sptr iface = usrp_e100_iface::make(new_addr["node"]); new_addr["name"] = iface->mb_eeprom["name"]; diff --git a/host/lib/utils/images.cpp b/host/lib/utils/images.cpp index 395e542c1..24a599322 100644 --- a/host/lib/utils/images.cpp +++ b/host/lib/utils/images.cpp @@ -30,11 +30,11 @@ std::vector<fs::path> get_image_paths(void); //defined in paths.cpp **********************************************************************/ std::string uhd::find_image_path(const std::string &image_name){ if (fs::exists(image_name)){ - return fs::system_complete(image_name).file_string(); + return fs::system_complete(image_name).string(); } BOOST_FOREACH(const fs::path &path, get_image_paths()){ fs::path image_path = path / image_name; - if (fs::exists(image_path)) return image_path.file_string(); + if (fs::exists(image_path)) return image_path.string(); } throw std::runtime_error("Could not find path for image: " + image_name); } diff --git a/host/lib/utils/load_modules.cpp b/host/lib/utils/load_modules.cpp index fa9b22438..33152855a 100644 --- a/host/lib/utils/load_modules.cpp +++ b/host/lib/utils/load_modules.cpp @@ -72,7 +72,7 @@ static void load_module(const std::string &file_name){ */ static void load_module_path(const fs::path &path){ if (not fs::exists(path)){ - //std::cerr << boost::format("Module path \"%s\" not found.") % path.file_string() << std::endl; + //std::cerr << boost::format("Module path \"%s\" not found.") % path.string() << std::endl; return; } @@ -90,7 +90,7 @@ static void load_module_path(const fs::path &path){ //its not a directory, try to load it try{ - load_module(path.file_string()); + load_module(path.string()); } catch(const std::exception &err){ std::cerr << boost::format("Error: %s") % err.what() << std::endl; |