Merge branch 'boost_fs_string' into next

2 files changed, 4 insertions, 4 deletions

diff --git a/host/lib/utils/images.cpp b/host/lib/utils/images.cpp
index 3756f035a..2b6c02772 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 uhd::io_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 ad39960bb..bee0d5304 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;