diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/c++14_warning.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4dfe22b..03d2e99 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 f3cb99c..33ccb20 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 |