diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2012-05-31 23:02:18 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-05-31 23:02:18 +0000 |
| commit | 7033d59e696fc0970ee31c8d0861a316bab6205a (patch) | |
| tree | 9304f95cbc369524671838e238bdf044a78f1d4e | |
| parent | 22e834575d655b4f0d9b6af8d2e908014c570df7 (diff) | |
| download | gcc-7033d59e696fc0970ee31c8d0861a316bab6205a.zip gcc-7033d59e696fc0970ee31c8d0861a316bab6205a.tar.gz gcc-7033d59e696fc0970ee31c8d0861a316bab6205a.tar.bz2 | |
re PR libstdc++/53543 ([unordered_map] conflict with __is_convertible clang intrinsic)
2012-05-31 Benjamin Kosnik <bkoz@redhat.com>
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 bd704ea..5b0e66f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-05-31 Benjamin Kosnik <bkoz@redhat.com> + + 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 <fdumont@gcc.gnu.org> * 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 708ef98..27badbc 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<typename _Pair> - using __is_convertible = std::is_convertible<_Pair, value_type>; + using __is_conv = std::is_convertible<_Pair, value_type>; template<typename _Pair> - using _IFconv = std::enable_if<__is_convertible<_Pair>::value>; + using _IFconv = std::enable_if<__is_conv<_Pair>::value>; template<typename _Pair> using _IFconvp = typename _IFconv<_Pair>::type; |