diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-31 23:02:18 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-31 23:02:18 +0000 |
| commit | c2649437013678d545998d35f288ed9256ab892d (patch) | |
| tree | 9304f95cbc369524671838e238bdf044a78f1d4e /libstdc++-v3 | |
| parent | 3918c286015305a3e3b7e6579f38b07caa1cc0cf (diff) | |
| download | gcc-c2649437013678d545998d35f288ed9256ab892d.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188088 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -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 bd704eaa564..5b0e66f75c7 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 708ef985675..27badbcb104 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; |