Imported Upstream version 1.72.0

[platform/upstream/boost.git] / tools / bcp / copy_path.cpp

diff --git a/tools/bcp/copy_path.cpp b/tools/bcp/copy_path.cpp
index 28822c0..4143c79 100644 (file)
--- a/tools/bcp/copy_path.cpp
+++ b/tools/bcp/copy_path.cpp
@@ -15,6 +15,7 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/regex.hpp>
+#include <boost/assert.hpp>
 #include <fstream>
 #include <iterator>
 #include <algorithm>
@@ -44,7 +45,7 @@ private:
 
 void bcp_implementation::copy_path(const fs::path& p)
 {
-   assert(!fs::is_directory(m_boost_path / p));
+   BOOST_ASSERT(!fs::is_directory(m_boost_path / p));
    if(fs::exists(m_dest_path / p))
    {
       std::cout << "Copying (and overwriting) file: " << p.string() << "\n";
@@ -160,6 +161,8 @@ void bcp_implementation::copy_path(const fs::path& p)
             "(\\(\\s*)boost(\\s*\\))\\s*(\\(\\s*)phoenix(\\s*\\))"
          "|"
             "(\\(\\s*)boost(\\s*\\))"
+         "|"
+            "(BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE[^\\)]*)boost(\\))"
          ")"
       );