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

stl_tree.h (_Rb_tree<>::max_size): Use Node_allocator for improved accuracy.

Browse Source 
2008-10-14  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/stl_tree.h (_Rb_tree<>::max_size): Use Node_allocator
	for improved accuracy.
	* include/bits/stl_list.h (list<>::max_size): Likewise.
	* testsuite/23_containers/multimap/capacity/29134.cc: Adjust.
	* testsuite/23_containers/set/capacity/29134.cc: Likewise.
	* testsuite/23_containers/multiset/capacity/29134.cc: Likewise.
	* testsuite/23_containers/list/capacity/29134.cc: Likewise.
	* testsuite/23_containers/map/capacity/29134.cc: Likewise.

From-SVN: r141110
This commit is contained in:
Paolo Carlini 2008-10-14 15:02:45 +00:00 committed by Paolo Carlini
parent 388092d5b4
commit 1fea874e7a
8 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,14 @@
2008-10-14 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_tree.h (_Rb_tree<>::max_size): Use Node_allocator
for improved accuracy.
* include/bits/stl_list.h (list<>::max_size): Likewise.
* testsuite/23_containers/multimap/capacity/29134.cc: Adjust.
* testsuite/23_containers/set/capacity/29134.cc: Likewise.
* testsuite/23_containers/multiset/capacity/29134.cc: Likewise.
* testsuite/23_containers/list/capacity/29134.cc: Likewise.
* testsuite/23_containers/map/capacity/29134.cc: Likewise.
2008-10-10 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/20_util/reference_wrapper/24803.cc: Avoid uninitialized

2
libstdc++-v3/include/bits/stl_list.h
View File

@ -807,7 +807,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
/** Returns the size() of the largest possible %list. */
size_type
max_size() const
{ return _M_get_Tp_allocator().max_size(); }
{ return _M_get_Node_allocator().max_size(); }
/**
* @brief Resizes the %list to the specified number of elements.

4
libstdc++-v3/include/bits/stl_tree.h
View File

@ -1,6 +1,6 @@
// RB tree implementation -*- C++ -*-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -643,7 +643,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
size_type
max_size() const
{ return get_allocator().max_size(); }
{ return _M_get_Node_allocator().max_size(); }
void
#ifdef __GXX_EXPERIMENTAL_CXX0X__

10
libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2006 Free Software Foundation, Inc.
// Copyright (C) 2006, 2007, 2008 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
@ -28,7 +28,13 @@ void test01()
std::list<int> l;
VERIFY( l.max_size() == l.get_allocator().max_size() );
#ifndef _GLIBCXX_DEBUG
using std::_List_node;
#else
using std::_GLIBCXX_STD_D::_List_node;
#endif
VERIFY( l.max_size() == std::allocator<_List_node<int> >().max_size() );
}
int main()

5
libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2006 Free Software Foundation, Inc.
// Copyright (C) 2006, 2007, 2008 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
@ -28,7 +28,8 @@ void test01()
std::map<int, int> m;
VERIFY( m.max_size() == m.get_allocator().max_size() );
VERIFY( (m.max_size() == std::allocator<std::_Rb_tree_node<
std::pair<const int, int> > >().max_size()) );
}
int main()

5
libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2006 Free Software Foundation, Inc.
// Copyright (C) 2006, 2007, 2008 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
@ -28,7 +28,8 @@ void test01()
std::multimap<int, int> mm;
VERIFY( mm.max_size() == mm.get_allocator().max_size() );
VERIFY( (mm.max_size() == std::allocator<std::_Rb_tree_node<
std::pair<const int, int> > >().max_size()) );
}
int main()

5
libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2006 Free Software Foundation, Inc.
// Copyright (C) 2006, 2007, 2008 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
@ -28,7 +28,8 @@ void test01()
std::multiset<int> ms;
VERIFY( ms.max_size() == ms.get_allocator().max_size() );
VERIFY( ms.max_size()
== std::allocator<std::_Rb_tree_node<int> >().max_size() );
}
int main()

5
libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2006 Free Software Foundation, Inc.
// Copyright (C) 2006, 2007, 2008 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
@ -28,7 +28,8 @@ void test01()
std::set<int> s;
VERIFY( s.max_size() == s.get_allocator().max_size() );
VERIFY( s.max_size() ==
std::allocator<std::_Rb_tree_node<int> >().max_size() );
}
int main()