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/fileview.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/fileview.cpp')
-rw-r--r--3rdParty/Boost/src/tools/bcp/fileview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/tools/bcp/fileview.cpp b/3rdParty/Boost/src/tools/bcp/fileview.cpp
index 845582d..ec9e71a 100644
--- a/3rdParty/Boost/src/tools/bcp/fileview.cpp
+++ b/3rdParty/Boost/src/tools/bcp/fileview.cpp
@@ -57,11 +57,11 @@ void fileview::close()
void fileview::open(const boost::filesystem::path& p)
{
cow();
- std::ifstream is(p.native_file_string().c_str());
+ std::ifstream is(p.string().c_str());
if(!is)
{
std::string msg("Bad file name: ");
- msg += p.native_file_string();
+ msg += p.string();
std::runtime_error e(msg);
boost::throw_exception(e);
}