array: Add feature-test macro.

	* include/experimental/array: Add feature-test macro.
	* testsuite/experimental/array/neg.cc: Update dg-error.

From-SVN: r226893

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4047292aeca9723a9dc544bdd771a70c14804af1..15fa9a2076f09b1ae05f9a3c279f798b77058901 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-14  Jonathan Wakely  <jwakely@redhat.com>
+
+       * include/experimental/array: Add feature-test macro.
+       * testsuite/experimental/array/neg.cc: Update dg-error.
+
 2015-08-13  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
        * testsuite/experimental/array/neg.s: Remove.

diff --git a/libstdc++-v3/include/experimental/array b/libstdc++-v3/include/experimental/array
index a6e983aeedf2f7d6747027c31067d7afa1762010..96174818fbb2723f71f3a2bf0298d8d3487d7ea8 100644 (file)
--- 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 df532d166c5c383fb90c19330d3b87ef54aff8a5..5db2a1877caab32580b4e19ec6fe73e1b6038c73 100644 (file)
--- 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 }
 }