Author: hans Date: Fri Aug 17 00:20:04 2018 New Revision: 339988 URL: http://llvm.org/viewvc/llvm-project?rev=339988&view=rev Log: 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 ------------------------------------------------------------------------ Modified: libcxx/branches/release_70/ (props changed) libcxx/branches/release_70/test/support/test_macros.h Propchange: libcxx/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 17 00:20:04 2018 @@ -1,2 +1,2 @@ /libcxx/branches/apple:136569-137939 -/libcxx/trunk:339431,339675,339697,339743,339794,339874 +/libcxx/trunk:339431,339675,339697,339702,339743,339794,339874 Modified: libcxx/branches/release_70/test/support/test_macros.h URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/test/support/test_macros.h?rev=339988&r1=339987&r2=339988&view=diff ============================================================================== --- libcxx/branches/release_70/test/support/test_macros.h (original) +++ libcxx/branches/release_70/test/support/test_macros.h Fri Aug 17 00:20:04 2018 @@ -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__) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
