OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Phil Edwards 2002-06-29 01:10:51 +00:00
parent 9137b119fa
commit 446c5b11aa
4 changed files with 95 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -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.

9
libstdc++-v3/include/std/std_queue.h
View File

@ -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 */

8
libstdc++-v3/include/std/std_stack.h
View File

@ -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 */

79
libstdc++-v3/testsuite/23_containers/adaptors.cc Normal file
View File

@ -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;
}