[llvm-branch-commits] [libcxx] r339987 - Merging r339675:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Aug 17 00:19:32 2018
New Revision: 339987

URL: http://llvm.org/viewvc/llvm-project?rev=339987&view=rev
Log:
Merging r339675:
------------------------------------------------------------------------
r339675 | ldionne | 2018-08-14 15:29:17 +0200 (Tue, 14 Aug 2018) | 15 lines

[libc++] Add missing #include in C11 features tests

Summary:
These #includes are quite important, since otherwise any

    #if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)

checks are always false, and so we don't actually test for C11 support
in the standard library.

Reviewers: mclow.lists, EricWF

Subscribers: christof, dexonsmith, cfe-commits

Differential Revision: https://reviews.llvm.org/D50674
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_70/   (props changed)
    libcxx/branches/release_70/test/libcxx/language.support/has_c11_features.pass.cpp
    libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp
    libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp

Propchange: libcxx/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 17 00:19:32 2018
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:339431,339697,339743,339794,339874
+/libcxx/trunk:339431,339675,339697,339743,339794,339874

Modified: libcxx/branches/release_70/test/libcxx/language.support/has_c11_features.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/test/libcxx/language.support/has_c11_features.pass.cpp?rev=339987&r1=339986&r2=339987&view=diff
==============================================================================
--- libcxx/branches/release_70/test/libcxx/language.support/has_c11_features.pass.cpp (original)
+++ libcxx/branches/release_70/test/libcxx/language.support/has_c11_features.pass.cpp Fri Aug 17 00:19:32 2018
@@ -14,6 +14,9 @@
 //		_LIBCPP_HAS_C11_FEATURES - which is defined in <__config>
 //	They should always be the same
 
+#include <__config>
+#include "test_macros.h"
+
 #ifdef TEST_HAS_C11_FEATURES
 # ifndef _LIBCPP_HAS_C11_FEATURES
 #  error "TEST_HAS_C11_FEATURES is defined, but _LIBCPP_HAS_C11_FEATURES is not"

Modified: libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp?rev=339987&r1=339986&r2=339987&view=diff
==============================================================================
--- libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp (original)
+++ libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp Fri Aug 17 00:19:32 2018
@@ -11,6 +11,8 @@
 
 #include <float.h>
 
+#include "test_macros.h"
+
 #ifndef FLT_ROUNDS
 #error FLT_ROUNDS not defined
 #endif

Modified: libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp?rev=339987&r1=339986&r2=339987&view=diff
==============================================================================
--- libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp (original)
+++ libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp Fri Aug 17 00:19:32 2018
@@ -11,6 +11,8 @@
 
 #include <cfloat>
 
+#include "test_macros.h"
+
 #ifndef FLT_ROUNDS
 #error FLT_ROUNDS not defined
 #endif