summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-03-14 18:35:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-03-14 18:35:17 (GMT)
commita135c6ff4dcded5661a2321512960b14cf8c15c8 (patch)
treeb0017ecfe702304f592b9d4e8b943784cff26fb2 /3rdParty/Boost/src/tools/bcp/file_types.cpp
parent02d6188ab335e6c62b8341b84579d9549d215118 (diff)
downloadswift-a135c6ff4dcded5661a2321512960b14cf8c15c8.zip
swift-a135c6ff4dcded5661a2321512960b14cf8c15c8.tar.bz2
Updated Boost to 1.46.1.
This should hopefuily fix a hang on shutdown on Mac OS X. Resolves: #782 Release-Notes: Fixed a potential hang on shutdown on Mac OS X.
Diffstat (limited to '3rdParty/Boost/src/tools/bcp/file_types.cpp')
-rw-r--r--3rdParty/Boost/src/tools/bcp/file_types.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/tools/bcp/file_types.cpp b/3rdParty/Boost/src/tools/bcp/file_types.cpp
index abc0149..7fc6850 100644
--- a/3rdParty/Boost/src/tools/bcp/file_types.cpp
+++ b/3rdParty/Boost/src/tools/bcp/file_types.cpp
@@ -23,7 +23,7 @@ bool bcp_implementation::is_source_file(const fs::path& p)
")",
boost::regex::perl | boost::regex::icase
);
- return boost::regex_match(p.filename(), e);
+ return boost::regex_match(p.filename().string(), e);
}
bool bcp_implementation::is_html_file(const fs::path& p)
@@ -34,7 +34,7 @@ bool bcp_implementation::is_html_file(const fs::path& p)
"html?|css"
")"
);
- return boost::regex_match(p.filename(), e);
+ return boost::regex_match(p.filename().string(), e);
}
bool bcp_implementation::is_binary_file(const fs::path& p)
@@ -52,7 +52,7 @@ bool bcp_implementation::is_binary_file(const fs::path& p)
"|"
"(Jamfile|makefile|configure)",
boost::regex::perl | boost::regex::icase);
- return !boost::regex_match(p.leaf(), e);
+ return !boost::regex_match(p.leaf().string(), e);
}
@@ -67,6 +67,6 @@ bool bcp_implementation::is_jam_file(const fs::path& p)
"(Jamfile|Jamroot)\\.?",
boost::regex::perl | boost::regex::icase
);
- return boost::regex_match(p.filename(), e);
+ return boost::regex_match(p.filename().string(), e);
}