diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-26 00:25:47 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-26 00:25:47 +0400 |
| commit | 8ad3e7396597ffcf56f3ad74c00dfc6fdcd504df (patch) | |
| tree | 2a3c4fb1c019baf936e8160419799af29fc80a36 /intern/cycles/util/util_path.cpp | |
| parent | 06a9482986daa8beea1bbb627e2b78b4c28bd3d2 (diff) | |
Make Cycles compatible with older boost versions.
Patch by IRIE Shinsuke, thanks!
Diffstat (limited to 'intern/cycles/util/util_path.cpp')
| -rw-r--r-- | intern/cycles/util/util_path.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index 53dbfe9a42c..f6b70bfb73f 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -26,6 +26,10 @@ OIIO_NAMESPACE_USING #include <stdio.h> +#if (BOOST_VERSION < 104400) +# define BOOST_FILESYSTEM_VERSION 2 +#endif + #include <boost/filesystem.hpp> #include <boost/algorithm/string.hpp> @@ -58,7 +62,11 @@ string path_user_get(const string& sub) string path_filename(const string& path) { +#if (BOOST_FILESYSTEM_VERSION == 2) + return boost::filesystem::path(path).filename(); +#else return boost::filesystem::path(path).filename().string(); +#endif } string path_dirname(const string& path) |