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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bd704eaa56471c2dd008cc5793f2c4ce4801b65b..5b0e66f75c7fe7985e65e52734815bb5367dd4c2 100644 (file)
--- 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 708ef985675fbc0c6aa7a4a4cd760fcef8ef9678..27badbcb104d70053ce5ab83aebb647ffac5a9fd 100644 (file)
--- 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;