[v3] libstdc++/53543

Message ID 20120531160606.3d174006@adair
State New
Headers show

Commit Message

Benjamin Kosnik May 31, 2012, 11:06 p.m.
Renames to avoid builtins on clang. 

(This patch of code is actually the punchline to the joke, "how many
template aliases are really required if you are going for no line
breaks and using 80 columns while using policy based designs.")

tested x86/linux



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.

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