diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-03-14 18:35:17 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-03-14 18:35:17 (GMT) |
commit | a135c6ff4dcded5661a2321512960b14cf8c15c8 (patch) | |
tree | b0017ecfe702304f592b9d4e8b943784cff26fb2 /3rdParty/Boost/src/boost/typeof | |
parent | 02d6188ab335e6c62b8341b84579d9549d215118 (diff) | |
download | swift-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/typeof')
-rw-r--r-- | 3rdParty/Boost/src/boost/typeof/msvc/typeof_impl.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/typeof/msvc/typeof_impl.hpp b/3rdParty/Boost/src/boost/typeof/msvc/typeof_impl.hpp index 2f58c18..74ebc70 100644 --- a/3rdParty/Boost/src/boost/typeof/msvc/typeof_impl.hpp +++ b/3rdParty/Boost/src/boost/typeof/msvc/typeof_impl.hpp @@ -153,7 +153,9 @@ namespace boost }; }; # endif -# if BOOST_WORKAROUND(BOOST_MSVC,==1310) +// EAN: preprocess this block out on advice of Peder Holt +// to eliminate errors in type_traits/common_type.hpp +# if 0 //BOOST_WORKAROUND(BOOST_MSVC,==1310) template<const std::type_info& ref_type_info> struct msvc_typeid_wrapper { typedef typename msvc_extract_type<msvc_typeid_wrapper>::id2type id2type; |