From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 23 Aug 2018 19:27:54 +0000 (+0100)
Subject: Fix failure when -fno-rtti test is run in C++17 or later
X-Git-Tag: upstream/12.2.0~29594
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=763ef11bffdcbff30062c44c220c9b6dcbe019dc;p=platform%2Fupstream%2Fgcc.git

Fix failure when -fno-rtti test is run in C++17 or later

	* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
	Only define when RTTI is enabled.

From-SVN: r263820
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c74cee2..53fbb8c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2018-08-23  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
+	Only define when RTTI is enabled.
+
 	* include/debug/vector (__niter_base): Define for C++98.
 
 	* testsuite/25_algorithms/partial_sort_copy/debug/irreflexive_neg.cc:
diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h
index 03679aa..b0fecfb 100644
--- a/libstdc++-v3/testsuite/util/testsuite_allocator.h
+++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h
@@ -697,7 +697,8 @@ namespace __gnu_test
     };
 #endif // C++11
 
-#if __cplusplus >= 201703L && __cpp_aligned_new
+#if __cplusplus >= 201703L
+#if __cpp_aligned_new && __cpp_rtti
     // A concrete memory_resource, with error checking.
     class memory_resource : public std::pmr::memory_resource
     {
@@ -835,6 +836,7 @@ namespace __gnu_test
 
       allocation_lists* lists;
     };
+#endif // aligned-new && rtti
 
     // Set the default resource, and restore the previous one on destruction.
     struct default_resource_mgr
@@ -849,7 +851,7 @@ namespace __gnu_test
       std::pmr::memory_resource* prev;
     };
 
-#endif // C++17 && aligned-new
+#endif // C++17
 
 } // namespace __gnu_test