From 446c5b11aa19715e2b1b3d90294a48f15153abb8 Mon Sep 17 00:00:00 2001
From: Phil Edwards <pme@gcc.gnu.org>
Date: Sat, 29 Jun 2002 01:10:51 +0000
Subject: [PATCH] PR libstdc++/7157, PR libstdc++/7158, PR libstdc++/7161

2002-06-28  Phil Edwards  <pme@gcc.gnu.org>

	PR libstdc++/7157, PR libstdc++/7158, PR libstdc++/7161
	* include/std/std_queue.h:  Include deque.tcc, vector.tcc.
	* include/std/std_stack.h:  Include deque.tcc.
	* testsuite/23_containers/adaptors.cc:  New file.

From-SVN: r55090
---
 libstdc++-v3/ChangeLog                        |  7 ++
 libstdc++-v3/include/std/std_queue.h          |  9 ++-
 libstdc++-v3/include/std/std_stack.h          |  8 +-
 .../testsuite/23_containers/adaptors.cc       | 79 +++++++++++++++++++
 4 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 libstdc++-v3/testsuite/23_containers/adaptors.cc

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 39da71a4ae5..869392e034a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-28  Phil Edwards  <pme@gcc.gnu.org>
+
+	PR libstdc++/7157, PR libstdc++/7158, PR libstdc++/7161
+	* include/std/std_queue.h:  Include deque.tcc, vector.tcc.
+	* include/std/std_stack.h:  Include deque.tcc.
+	* testsuite/23_containers/adaptors.cc:  New file.
+
 2002-06-27  Phil Edwards  <pme@gcc.gnu.org>
 
 	* include/bits/stl_alloc.h:  Deprecate all 'reallocate' memfns.
diff --git a/libstdc++-v3/include/std/std_queue.h b/libstdc++-v3/include/std/std_queue.h
index 6be35516d65..60636e6f0dd 100644
--- a/libstdc++-v3/include/std/std_queue.h
+++ b/libstdc++-v3/include/std/std_queue.h
@@ -74,8 +74,9 @@
 #include <bits/stl_function.h>
 #include <bits/stl_queue.h>
 
-#endif /* _CPP_QUEUE */
+#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#  include <bits/deque.tcc>
+#  include <bits/vector.tcc>
+#endif
 
-// Local Variables:
-// mode:C++
-// End:
+#endif /* _CPP_QUEUE */
diff --git a/libstdc++-v3/include/std/std_stack.h b/libstdc++-v3/include/std/std_stack.h
index e517c42b6ab..ddae7e78fc6 100644
--- a/libstdc++-v3/include/std/std_stack.h
+++ b/libstdc++-v3/include/std/std_stack.h
@@ -70,8 +70,8 @@
 #include <bits/stl_deque.h>
 #include <bits/stl_stack.h>
 
-#endif /* _CPP_STACK */
+#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#  include <bits/deque.tcc>
+#endif
 
-// Local Variables:
-// mode:C++
-// End:
+#endif /* _CPP_STACK */
diff --git a/libstdc++-v3/testsuite/23_containers/adaptors.cc b/libstdc++-v3/testsuite/23_containers/adaptors.cc
new file mode 100644
index 00000000000..e0bd8618300
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/adaptors.cc
@@ -0,0 +1,79 @@
+// 2002-06-28 pme
+
+// Copyright (C) 2002 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 23.2.3 container adaptros
+
+#include <queue>
+#include <stack>
+#include <testsuite_hooks.h>
+
+// libstdc++/7157
+void
+test01()
+{
+  std::queue<int> q;
+
+  q.push(1);
+  q.front();
+  q.pop();
+}
+
+
+// libstdc++/7158
+void
+test02()
+{
+  std::stack<int> st;
+
+  st.push(1);
+  st.top() = 42;
+  st.pop();
+}
+
+
+// libstdc++/7161
+void
+test03()
+{
+  int data[] = {1, 2, 3};
+  std::priority_queue<int> pq;
+  std::size_t size = pq.size();
+
+  for (int i = 0; i < 3; ++i)
+    pq.push(data[i]);
+
+  size = pq.size();
+  pq.top();
+  for (int i = 0; i < 2; ++i)
+    pq.pop();
+
+  while (!pq.empty())
+    pq.pop();
+}
+
+
+int main()
+{
+  test01();
+  test02();
+  test03();
+
+  return 0;
+}