Do not declare std::uses_allocator before C++11

Backport from mainline
2019-10-22  Jonathan Wakely  <jwakely@redhat.com>

	* include/bits/memoryfwd.h (uses_allocator): Do not declare for C++98.
	* testsuite/17_intro/names.cc: Check uses_allocator in C++98.

From-SVN: r277387

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 00cab77041743df188f1c9cbb3e5e4a0070fa11b..fe6c649aece6cffb48d631a17334fbccfbf13ff9 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-24  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2019-10-22  Jonathan Wakely  <jwakely@redhat.com>
+
+       * include/bits/memoryfwd.h (uses_allocator): Do not declare for C++98.
+       * testsuite/17_intro/names.cc: Check uses_allocator in C++98.
+
        Backport from mainline
        2019-10-18  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/include/bits/memoryfwd.h b/libstdc++-v3/include/bits/memoryfwd.h
index 8b1664a398d55b7fa53d2bce68953d84826f1a40..732ac805322d596ff28fe49572fe45e3d167cf71 100644 (file)
--- a/libstdc++-v3/include/bits/memoryfwd.h
+++ b/libstdc++-v3/include/bits/memoryfwd.h
@@ -66,9 +66,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<>
     class allocator<void>;
 
+#if __cplusplus >= 201103L
   /// Declare uses_allocator so it can be specialized in \<queue\> etc.
   template<typename, typename>
     struct uses_allocator;
+#endif
 
   /// @} group memory
 

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 66c639ff3a33e1ff71ee7c892addb470379884ce..a47d53503e3fa07f768dc3fbbc4d38d6b5f69808 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -100,6 +100,10 @@
 
 #define tmp (
 
+#if __cplusplus < 201103L
+#define uses_allocator  (
+#endif
+
 #if __cplusplus < 201703L
 // <charconv> defines to_chars_result::ptr and to_chars_result::ec
 #define ec (