Ticket #35140: patch-filenameparse.cc.diff

src/filenameparse.cc

@@ -50 +50 @@
 #ifdef HAVE_BOOST_FILESYSTEM
 #include <boost/filesystem.hpp>
 
+#if BOOST_FILESYSTEM_VERSION < 3
 typedef boost::filesystem::basic_path<std::string, boost::filesystem::path_traits> basic_path;
+#define GETPATHSTRING(x) x
+#else
+typedef boost::filesystem::path basic_path;
+#define GETPATHSTRING(x) (x).string()
+#endif
 #endif
 
 
@@ -95 +101 @@
 {
 #ifdef HAVE_BOOST_FILESYSTEM
     const basic_path path(aFilename);
-    return path.leaf();
+    return GETPATHSTRING(path.leaf());
 #else
     const std::string::size_type separator = aFilename.rfind(PATH_SEPARATOR);
     return
@@ -179 +185 @@
         }
         else
         {
-            directories.push_back(*p);
+            directories.push_back(GETPATHSTRING(*p));
         }
     }
     basic_path result;