summaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/experimental/bits
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2017-09-12 15:03:06 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2017-09-12 15:03:06 +0100
commitd681026df10348e1fbede89055cbd395dc66cdd8 (patch)
tree12fae1c73f9c12f2a2835e237cbd3d7c94bcadec /libstdc++-v3/include/experimental/bits
parentc6888c62577671bdc5b4d71f21bd23897cc1db69 (diff)
downloadgcc-d681026df10348e1fbede89055cbd395dc66cdd8.tar.gz
PR libstdc++/79433 no #error for including TS headers with wrong -std
PR libstdc++/79433 * include/Makefile.am: Remove <bits/c++14_warning.h>. * include/Makefile.in: Regenerate. * include/bits/c++14_warning.h: Remove. * include/experimental/algorithm: Do not include <c++14_warning.h>. * include/experimental/any: Likewise. * include/experimental/array: Likewise. * include/experimental/bits/erase_if.h: Likewise. * include/experimental/bits/lfts_config.h: Likewise. * include/experimental/bits/shared_ptr.h: Likewise. * include/experimental/bits/string_view.tcc: Likewise. * include/experimental/chrono: Likewise. * include/experimental/deque: Likewise. * include/experimental/filesystem: Do not include <c++0x_warning.h>. * include/experimental/forward_list: Do not include <c++14_warning.h>. * include/experimental/functional: Likewise. * include/experimental/iterator: Likewise. * include/experimental/list: Likewise. * include/experimental/map: Likewise. * include/experimental/memory: Likewise. * include/experimental/numeric: Likewise. * include/experimental/optional: Likewise. * include/experimental/propagate_const: Likewise. * include/experimental/ratio: Likewise. * include/experimental/regex: Likewise. * include/experimental/set: Likewise. * include/experimental/string: Likewise. * include/experimental/string_view: Likewise. * include/experimental/system_error: Likewise. * include/experimental/tuple: Likewise. * include/experimental/type_traits: Likewise. * include/experimental/unordered_map: Likewise. * include/experimental/unordered_set: Likewise. * include/experimental/vector: Likewise. * testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error line number. * testsuite/experimental/array/neg.cc: Likewise. * testsuite/experimental/propagate_const/assignment/move_neg.cc: Likewise. * testsuite/experimental/propagate_const/cons/move_neg.cc: Likewise. * testsuite/experimental/propagate_const/requirements2.cc: Likewise. * testsuite/experimental/propagate_const/requirements3.cc: Likewise. * testsuite/experimental/propagate_const/requirements4.cc: Likewise. * testsuite/experimental/propagate_const/requirements5.cc: Likewise. From-SVN: r252019
Diffstat (limited to 'libstdc++-v3/include/experimental/bits')
-rw-r--r--libstdc++-v3/include/experimental/bits/erase_if.h4
-rw-r--r--libstdc++-v3/include/experimental/bits/lfts_config.h4
-rw-r--r--libstdc++-v3/include/experimental/bits/shared_ptr.h4
-rw-r--r--libstdc++-v3/include/experimental/bits/string_view.tcc4
4 files changed, 4 insertions, 12 deletions
diff --git a/libstdc++-v3/include/experimental/bits/erase_if.h b/libstdc++-v3/include/experimental/bits/erase_if.h
index cc89ffad900..8ba59fafc2d 100644
--- a/libstdc++-v3/include/experimental/bits/erase_if.h
+++ b/libstdc++-v3/include/experimental/bits/erase_if.h
@@ -32,9 +32,7 @@
#pragma GCC system_header
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
+#if __cplusplus >= 201402L
#include <experimental/bits/lfts_config.h>
namespace std
diff --git a/libstdc++-v3/include/experimental/bits/lfts_config.h b/libstdc++-v3/include/experimental/bits/lfts_config.h
index 3b832706da0..58cabea2162 100644
--- a/libstdc++-v3/include/experimental/bits/lfts_config.h
+++ b/libstdc++-v3/include/experimental/bits/lfts_config.h
@@ -27,9 +27,7 @@
* Do not attempt to use it directly.
*/
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
+#if __cplusplus >= 201402L
#include <bits/c++config.h>
#if _GLIBCXX_INLINE_VERSION
diff --git a/libstdc++-v3/include/experimental/bits/shared_ptr.h b/libstdc++-v3/include/experimental/bits/shared_ptr.h
index ef391eb641f..8f21ad8b4e5 100644
--- a/libstdc++-v3/include/experimental/bits/shared_ptr.h
+++ b/libstdc++-v3/include/experimental/bits/shared_ptr.h
@@ -32,9 +32,7 @@
#pragma GCC system_header
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
+#if __cplusplus >= 201402L
#include <memory>
#include <experimental/type_traits>
diff --git a/libstdc++-v3/include/experimental/bits/string_view.tcc b/libstdc++-v3/include/experimental/bits/string_view.tcc
index 450a43c7876..3a2279cac26 100644
--- a/libstdc++-v3/include/experimental/bits/string_view.tcc
+++ b/libstdc++-v3/include/experimental/bits/string_view.tcc
@@ -36,9 +36,7 @@
#pragma GCC system_header
-#if __cplusplus <= 201103L
-# include <bits/c++14_warning.h>
-#else
+#if __cplusplus >= 201402L
namespace std _GLIBCXX_VISIBILITY(default)
{