From b2a485f2b0641e8e3c1c2a8e4fcf5b3864e692c0 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 10 Dec 2015 14:39:07 +0000
Subject: [PATCH] Change tests to use -std=gnu++14 not -std=gnu++1y

	* testsuite/experimental/memory/shared_ptr/assign/assign.cc: Replace
	-std=gnu++1y with -std=gnu++14.
	* testsuite/experimental/memory/shared_ptr/cast/cast.cc: Likewise.
	* testsuite/experimental/memory/shared_ptr/comparison/comparison.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/alias_ctor.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/alloc_ctor.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/copy_ctor.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/default_ctor.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/move_ctor.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/pointer_ctor.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/dest/dest.cc: Likewise.
	* testsuite/experimental/memory/shared_ptr/modifiers/reset.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/modifiers/swap.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/observers/bool_conv.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/observers/operators.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/observers/owner_before.cc:
	Likewise.
	* testsuite/experimental/memory/shared_ptr/observers/use_count.cc:
	Likewise.

From-SVN: r231517
---
 libstdc++-v3/ChangeLog                             | 37 ++++++++++++++++++++++
 .../memory/shared_ptr/assign/assign.cc             |  2 +-
 .../experimental/memory/shared_ptr/cast/cast.cc    |  2 +-
 .../memory/shared_ptr/comparison/comparison.cc     |  2 +-
 .../memory/shared_ptr/cons/alias_ctor.cc           |  2 +-
 .../memory/shared_ptr/cons/alloc_ctor.cc           |  2 +-
 .../memory/shared_ptr/cons/copy_ctor.cc            |  2 +-
 .../memory/shared_ptr/cons/copy_ctor_neg.cc        |  2 +-
 .../memory/shared_ptr/cons/default_ctor.cc         |  2 +-
 .../memory/shared_ptr/cons/move_ctor.cc            |  2 +-
 .../memory/shared_ptr/cons/pointer_ctor.cc         |  2 +-
 .../memory/shared_ptr/cons/unique_ptr_ctor.cc      |  2 +-
 .../memory/shared_ptr/cons/weak_ptr_ctor.cc        |  2 +-
 .../experimental/memory/shared_ptr/dest/dest.cc    |  2 +-
 .../memory/shared_ptr/modifiers/reset.cc           |  2 +-
 .../memory/shared_ptr/modifiers/swap.cc            |  2 +-
 .../memory/shared_ptr/observers/bool_conv.cc       |  2 +-
 .../memory/shared_ptr/observers/operators.cc       |  2 +-
 .../memory/shared_ptr/observers/owner_before.cc    |  2 +-
 .../memory/shared_ptr/observers/use_count.cc       |  2 +-
 20 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e29a613..3fc7f57 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,42 @@
 2015-12-10  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/experimental/memory/shared_ptr/assign/assign.cc: Replace
+	-std=gnu++1y with -std=gnu++14.
+	* testsuite/experimental/memory/shared_ptr/cast/cast.cc: Likewise.
+	* testsuite/experimental/memory/shared_ptr/comparison/comparison.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/alias_ctor.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/alloc_ctor.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/copy_ctor.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/default_ctor.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/move_ctor.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/pointer_ctor.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/dest/dest.cc: Likewise.
+	* testsuite/experimental/memory/shared_ptr/modifiers/reset.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/modifiers/swap.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/observers/bool_conv.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/observers/operators.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/observers/owner_before.cc:
+	Likewise.
+	* testsuite/experimental/memory/shared_ptr/observers/use_count.cc:
+	Likewise.
+
 	PR libstdc++/68825
 	* include/experimental/bits/shared_ptr.h (__shared_ptr, __weak_ptr,
 	experimental::shared_ptr, experimental::weak_ptr): Constrain
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/assign/assign.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/assign/assign.cc
index 7656c98..141be63 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/assign/assign.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/assign/assign.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cast/cast.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cast/cast.cc
index 18c2ba4..06b5ea1 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cast/cast.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cast/cast.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc
index 52fc193..61b9d0c 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/alias_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/alias_ctor.cc
index 15d1de8..d37026a 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/alias_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/alias_ctor.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/alloc_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/alloc_ctor.cc
index 12eb15c..7c99d4e 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/alloc_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/alloc_ctor.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor.cc
index 4c3680e..e754d56 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc
index b2691e9..bc8bcf2 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 // { dg-do compile }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/default_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/default_ctor.cc
index 794e865..74f076a 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/default_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/default_ctor.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/move_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/move_ctor.cc
index 3c070fe..3b535a9 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/move_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/move_ctor.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/pointer_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/pointer_ctor.cc
index d9ae591a..11681db 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/pointer_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/pointer_ctor.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc
index 35fb82f..9664910 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/unique_ptr_ctor.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc
index 342b37b..99f17cc 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/weak_ptr_ctor.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/dest/dest.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/dest/dest.cc
index 989121d..0494184 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/dest/dest.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/dest/dest.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/modifiers/reset.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/modifiers/reset.cc
index bd1ce1d..2518b20 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/modifiers/reset.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/modifiers/reset.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/modifiers/swap.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/modifiers/swap.cc
index 758042c..b61999f 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/modifiers/swap.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/bool_conv.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/bool_conv.cc
index 7e4c750..0973944 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/bool_conv.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/bool_conv.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/operators.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/operators.cc
index d32c899..995c1c9 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/operators.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/operators.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/owner_before.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/owner_before.cc
index 24a658a..268f479 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/owner_before.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/owner_before.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/use_count.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/use_count.cc
index fc48bf2..35864ad 100644
--- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/use_count.cc
+++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/observers/use_count.cc
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++1y" }
+// { dg-options "-std=gnu++14" }
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
-- 
2.7.4