RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-12 05:56:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch the is_integral_or_enum trait machinery to use an explicit

Browse Source 
template argument and an *implicit* conversion from '0' to a null
pointer. For some bizarre reason, GCC 4.3.2 thinks that the cast to
'(T*)' is invalid inside of an enumerator's value... which it isn't but
whatever. ;] This pattern is used elsewhere in the type_traits header
and so hopefully will survive the wrath of the build bots.

llvm-svn: 152220
This commit is contained in:
Chandler Carruth 2012-03-07 10:05:35 +00:00
parent d731be046b
commit 83d690cd03
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/Support/type_traits.h
View File

@ -133,7 +133,7 @@ template <typename T> class is_integral_or_enum {
// types (or with nullptr_t in C++11).
template <typename U, U u = U()> struct check1_return_type { char c[2]; };
template <typename U> static check1_return_type<U> checker1(U*);
static char checker1(...);
template <typename U> static char checker1(...);
// Form a return type that can only be instantiated with nullptr_t in C++11
// mode. It's harmless in C++98 mode, but this allows us to filter nullptr_t
@ -143,12 +143,12 @@ template <typename T> class is_integral_or_enum {
template <typename U, nonce* u = U()>
struct check2_return_type { char c[2]; };
template <typename U> static check2_return_type<U> checker2(U*);
static char checker2(...);
template <typename U> static char checker2(...);
public:
enum {
value = (sizeof(char) != sizeof(checker1((T*)0)) &&
sizeof(char) == sizeof(checker2((T*)0)))
value = (sizeof(char) != sizeof(checker1<T>(0)) &&
sizeof(char) == sizeof(checker2<T>(0)))
};
};