From 7033d59e696fc0970ee31c8d0861a316bab6205a Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 31 May 2012 23:02:18 +0000 Subject: [PATCH] re PR libstdc++/53543 ([unordered_map] conflict with __is_convertible clang intrinsic) 2012-05-31 Benjamin Kosnik PR libstdc++/53543 * include/bits/hashtable_policy.h (_Insert::__is_convertible): Rename to __is_conv to avoid clash with clang built-in. From-SVN: r188088 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/hashtable_policy.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bd704eaa5647..5b0e66f75c7f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-05-31 Benjamin Kosnik + + PR libstdc++/53543 + * include/bits/hashtable_policy.h (_Insert::__is_convertible): + Rename to __is_conv to avoid clash with clang built-in. + 2012-05-29 François Dumont * include/bits/stl_tempbuf.h (__uninitialized_construct_buf) diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index 708ef985675f..27badbcb104d 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -831,10 +831,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using __base_type::insert; template - using __is_convertible = std::is_convertible<_Pair, value_type>; + using __is_conv = std::is_convertible<_Pair, value_type>; template - using _IFconv = std::enable_if<__is_convertible<_Pair>::value>; + using _IFconv = std::enable_if<__is_conv<_Pair>::value>; template using _IFconvp = typename _IFconv<_Pair>::type;