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/boost/io/detail
parent02d6188ab335e6c62b8341b84579d9549d215118 (diff)
downloadswift-contrib-a135c6ff4dcded5661a2321512960b14cf8c15c8.zip
swift-contrib-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/boost/io/detail')
-rw-r--r--3rdParty/Boost/src/boost/io/detail/quoted_manip.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/io/detail/quoted_manip.hpp b/3rdParty/Boost/src/boost/io/detail/quoted_manip.hpp
index 13cfc35..502f422 100644
--- a/3rdParty/Boost/src/boost/io/detail/quoted_manip.hpp
+++ b/3rdParty/Boost/src/boost/io/detail/quoted_manip.hpp
@@ -125,15 +125,15 @@ namespace boost
std::basic_istream<Char, Traits>& operator>>(std::basic_istream<Char, Traits>& is,
const quoted_proxy<std::basic_string<Char, Traits, Alloc>&, Char>& proxy)
{
+ proxy.string.clear();
Char c;
is >> c;
if (c != proxy.delim)
{
- proxy.string = c;
+ is.unget();
is >> proxy.string;
return is;
}
- proxy.string.clear();
{
boost::io::ios_flags_saver ifs(is);
is >> std::noskipws;