From 357c9f7edc4154418f9862652b53fa8321e91d22 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 14 Aug 2015 12:51:05 +0100 Subject: [PATCH] array: Add feature-test macro. * include/experimental/array: Add feature-test macro. * testsuite/experimental/array/neg.cc: Update dg-error. From-SVN: r226893 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/experimental/array | 1 + libstdc++-v3/testsuite/experimental/array/neg.cc | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4047292aeca..15fa9a2076f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2015-08-14 Jonathan Wakely + + * include/experimental/array: Add feature-test macro. + * testsuite/experimental/array/neg.cc: Update dg-error. + 2015-08-13 Ville Voutilainen * testsuite/experimental/array/neg.s: Remove. diff --git a/libstdc++-v3/include/experimental/array b/libstdc++-v3/include/experimental/array index a6e983aeedf..96174818fbb 100644 --- a/libstdc++-v3/include/experimental/array +++ b/libstdc++-v3/include/experimental/array @@ -47,6 +47,7 @@ inline namespace fundamentals_v2 { _GLIBCXX_BEGIN_NAMESPACE_VERSION +#define __cpp_lib_experimental_make_array 201505 /** * @defgroup make_array Array creation functions * @ingroup experimental diff --git a/libstdc++-v3/testsuite/experimental/array/neg.cc b/libstdc++-v3/testsuite/experimental/array/neg.cc index df532d166c5..5db2a1877ca 100644 --- a/libstdc++-v3/testsuite/experimental/array/neg.cc +++ b/libstdc++-v3/testsuite/experimental/array/neg.cc @@ -24,5 +24,5 @@ int main() { int dummy; auto bad = std::experimental::make_array(std::ref(dummy)); - // { dg-error "make_array cannot be used without an explicit target type if any of the types given is a reference_wrapper" "" { target *-*-* } 76 } + // { dg-error "make_array cannot be used without an explicit target type if any of the types given is a reference_wrapper" "" { target *-*-* } 77 } } -- 2.30.2