summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2018-08-17 07:20:04 +0000
committerHans Wennborg <hans@hanshq.net>2018-08-17 07:20:04 +0000
commitff0e60f32380a07c8c3c006587758b4f8e05af71 (patch)
tree95807d12ad950348f25561545d2045535f65a910
parent719997b080f41948e51cef0491669abd3ff12d3d (diff)
downloadbcm5719-llvm-ff0e60f32380a07c8c3c006587758b4f8e05af71.tar.gz
bcm5719-llvm-ff0e60f32380a07c8c3c006587758b4f8e05af71.zip
Merging r339702:
------------------------------------------------------------------------ r339702 | ldionne | 2018-08-14 20:16:56 +0200 (Tue, 14 Aug 2018) | 11 lines [libc++] Fix incorrect definition of TEST_HAS_C11_FEATURES Summary: The macro was not defined in C++11 mode when it should have been, at least according to how _LIBCPP_HAS_C11_FEATURES is defined. Reviewers: mclow.lists, EricWF, jfb, dexonsmith Subscribers: christof, dexonsmith, cfe-commits Differential Revision: https://reviews.llvm.org/D50719 ------------------------------------------------------------------------ llvm-svn: 339988
-rw-r--r--libcxx/test/support/test_macros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h
index ac6ec79b923..d774fc0384d 100644
--- a/libcxx/test/support/test_macros.h
+++ b/libcxx/test/support/test_macros.h
@@ -124,7 +124,7 @@
// Sniff out to see if the underling C library has C11 features
// Note that at this time (July 2018), MacOS X and iOS do NOT.
-#if __ISO_C_VISIBLE >= 2011
+#if __ISO_C_VISIBLE >= 2011 || TEST_STD_VER >= 11
# if defined(__FreeBSD__)
# define TEST_HAS_C11_FEATURES
# elif defined(__Fuchsia__)
OpenPOWER on IntegriCloud