llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-21 23:30:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak traits tests by handling differences between version macros in clang/apple-clang.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@276200 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-07-20 22:53:21 +00:00
parent bda156d540
commit b5bdc070f2
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
View File

@@ -157,7 +157,8 @@ int main()
// TODO: Remove this workaround once Clang <= 3.7 are no longer used regularly. // TODO: Remove this workaround once Clang <= 3.7 are no longer used regularly.
// In those compiler versions the __is_constructible builtin gives the wrong // In those compiler versions the __is_constructible builtin gives the wrong
// results for abominable function types. // results for abominable function types.
#if defined(__clang__) && __clang_major__ == 3 && __clang_minor__ < 8 #if (defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER < 703) \
|| (defined(TEST_CLANG_VER) && TEST_CLANG_VER < 308)
#define WORKAROUND_CLANG_BUG #define WORKAROUND_CLANG_BUG
#endif #endif
#if !defined(WORKAROUND_CLANG_BUG) #if !defined(WORKAROUND_CLANG_BUG)

3
test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
View File

@@ -111,7 +111,8 @@ int main()
// TODO: Remove this workaround once Clang <= 3.7 are no longer used regularly. // TODO: Remove this workaround once Clang <= 3.7 are no longer used regularly.
// In those compiler versions the __is_constructible builtin gives the wrong // In those compiler versions the __is_constructible builtin gives the wrong
// results for abominable function types. // results for abominable function types.
#if defined(__clang__) && __clang_major__ == 3 && __clang_minor__ < 8 #if (defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER < 703) \
|| (defined(TEST_CLANG_VER) && TEST_CLANG_VER < 308)
#define WORKAROUND_CLANG_BUG #define WORKAROUND_CLANG_BUG
#endif #endif
#if !defined(WORKAROUND_CLANG_BUG) #if !defined(WORKAROUND_CLANG_BUG)

8
test/support/test_macros.h
View File

@@ -34,6 +34,14 @@
#define TEST_HAS_BUILTIN(X) 0 #define TEST_HAS_BUILTIN(X) 0
#endif #endif
#if defined(__apple_build_version__)
#define TEST_APPLE_CLANG_VER (__clang_major__ * 100) + __clang_minor__
#elif defined(__clang_major__)
#define TEST_CLANG_VER (__clang_major__ * 100) + __clang_minor__
#elif defined(__GNUC__)
#define TEST_GCC_VER (__GNUC__ * 100 + __GNUC_MINOR__)
#endif
/* Make a nice name for the standard version */ /* Make a nice name for the standard version */
#ifndef TEST_STD_VER #ifndef TEST_STD_VER
#if __cplusplus <= 199711L #if __cplusplus <= 199711L