diff options
author | Josh Blum <josh@joshknows.com> | 2011-03-17 14:18:01 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-03-17 14:18:01 -0700 |
commit | dd1571aa2369573e8f4626b078fbd794e84904cd (patch) | |
tree | fb4f3afad80bdf2a04c3a3a1163ffc5d4dd73aa9 /host/lib/utils/images.cpp | |
parent | 420491d4f9521c34696c6c2483c9a37fe90f4d2c (diff) | |
parent | 0d0d03d08d13037da2f2f1c85e546addff32aa69 (diff) | |
download | uhd-dd1571aa2369573e8f4626b078fbd794e84904cd.tar.gz uhd-dd1571aa2369573e8f4626b078fbd794e84904cd.tar.bz2 uhd-dd1571aa2369573e8f4626b078fbd794e84904cd.zip |
Merge branch 'boost_fs_string' into next
Diffstat (limited to 'host/lib/utils/images.cpp')
-rw-r--r-- | host/lib/utils/images.cpp | 4 |
1 files changed, 2 insertions, 2 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); } |