Allow libc++ to be built with GCC 5.0 compiler

Differential Revision: http://reviews.llvm.org/D5169

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@217038 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 5907f03123)
Change-Id: I8d9f2496c587b8eda7906e08bf3db218db642f20
This commit is contained in:
Alexey Volkov
2014-09-03 14:30:39 +00:00
committed by Dan Albert
parent 246124b60c
commit 3d9e6ba593

View File

@@ -623,8 +623,8 @@ template <unsigned> struct __static_assert_check {};
// g++ and cl.exe have RTTI on by default and define a macro when it is. // g++ and cl.exe have RTTI on by default and define a macro when it is.
// g++ only defines the macro in 4.3.2 and onwards. // g++ only defines the macro in 4.3.2 and onwards.
#if !defined(_LIBCPP_NO_RTTI) #if !defined(_LIBCPP_NO_RTTI)
# if defined(__GNUG__) && (__GNUC__ >= 4 && \ # if defined(__GNUG__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \
(__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2)) && !defined(__GXX_RTTI) (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI)
# define _LIBCPP_NO_RTTI # define _LIBCPP_NO_RTTI
# elif (defined(_MSC_VER) && !defined(__clang__)) && !defined(_CPPRTTI) # elif (defined(_MSC_VER) && !defined(__clang__)) && !defined(_CPPRTTI)
# define _LIBCPP_NO_RTTI # define _LIBCPP_NO_RTTI