aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authoremsr <emsr@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-19 16:29:05 +0000
committeremsr <emsr@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-19 16:29:05 +0000
commit46c5738f20730ad786046890ac4186ee23fb3a80 (patch)
tree9f0aa36f645db7c3ea6715e448e67c7bdfd4a50c /libstdc++-v3
parentb7040bb0c4b7abc377a0bd5ab896a9c002614a7a (diff)
2016-04-19 Edward Smith-Rowland <3dw4rd@verizon.net>
* include/bits/c++14_warning.h: Do not refer C++14 as experimental. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235210 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/bits/c++14_warning.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4dfe22bd932..03d2e994d6a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-19 Edward Smith-Rowland <3dw4rd@verizon.net>
+
+ * include/bits/c++14_warning.h: Do not refer C++14 as experimental.
+
2016-04-18 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/41759
diff --git a/libstdc++-v3/include/bits/c++14_warning.h b/libstdc++-v3/include/bits/c++14_warning.h
index f3cb99c593b..33ccb208bd4 100644
--- a/libstdc++-v3/include/bits/c++14_warning.h
+++ b/libstdc++-v3/include/bits/c++14_warning.h
@@ -29,9 +29,9 @@
#define _CXX14_WARNING_H 1
#if __cplusplus <= 201103L
-#error This file requires compiler and library support for the forthcoming \
-ISO C++ 2014 standard. This support is currently experimental, and must be \
-enabled with the -std=c++1y or -std=gnu++1y compiler options.
+#error This file requires compiler and library support \
+for the ISO C++ 2014 standard. This support must be enabled \
+with the -std=c++14 or -std=gnu++14 compiler options.
#endif
#endif