OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Benjamin Kosnik 2012-05-31 23:02:18 +00:00 committed by Benjamin Kosnik
parent 22e834575d
commit 7033d59e69
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -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)

4
libstdc++-v3/include/bits/hashtable_policy.h
View File

@ -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;