Ticket #4485: patch.diff

boost/iostreams/detail/path.hpp

@@ -50 +50 @@
     template<typename Path>
     explicit path(const Path& p, typename Path::external_string_type* = 0)
     {
-        typedef typename Path::external_string_type string_type;
-        init(p, boost::type<string_type>());
+        init(p.external_file_string());
     }
 
+    // Constructor taking a boost::filesystem3::path (boost filesystem v3)
+    template<typename Path>
+    explicit path(const Path& p, typename Path::string_type* = 0)
+    {
+        init(p.native());
+    }
+
     // Copy constructor
     path(const path& p) 
         : narrow_(p.narrow_), wide_(p.wide_), is_wide_(p.is_wide_) 
@@ -111 +117 @@
     path(const std::wstring&);
     path& operator=(const std::wstring&);
 
-    template<typename Path>
-    void init(const Path& p, boost::type<std::string>)
+    void init(std::string const& file_path)
     {
-        narrow_ = p.external_file_string();
+        narrow_ = file_path;
         wide_.clear();
         is_wide_ = false;
     }
 
-    template<typename Path>
-    void init(const Path& p, boost::type<std::wstring>)
+    void init(std::wstring const& file_path)
     {
         narrow_.clear();
-        wide_ = p.external_file_string();
+        wide_ = file_path;
         is_wide_ = true;
     }