summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/typeof/msvc/typeof_impl.hpp')
-rw-r--r--3rdParty/Boost/src/boost/typeof/msvc/typeof_impl.hpp4
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;