You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2007/11/19 15:52:35 UTC
svn commit: r596316 - in /incubator/stdcxx/trunk/include: deque list.cc
rw/_tree.cc vector.cc
Author: faridz
Date: Mon Nov 19 06:52:33 2007
New Revision: 596316
URL: http://svn.apache.org/viewvc?rev=596316&view=rev
Log:
2007-11-19 Farid Zaripov <fa...@epam.com>
* deque (_C_bufsize): Use _RWSTD_NEW_CAPACITY macro
instead of __rw_new_capacity().
* list.cc (_C_add_buffer): Ditto.
* rw/_tree.cc (_C_add_new_buffer): Ditto.
* vector.cc (_C_realloc): Ditto.
Modified:
incubator/stdcxx/trunk/include/deque
incubator/stdcxx/trunk/include/list.cc
incubator/stdcxx/trunk/include/rw/_tree.cc
incubator/stdcxx/trunk/include/vector.cc
Modified: incubator/stdcxx/trunk/include/deque
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/deque?rev=596316&r1=596315&r2=596316&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/deque (original)
+++ incubator/stdcxx/trunk/include/deque Mon Nov 19 06:52:33 2007
@@ -117,7 +117,8 @@
// deque only uses __rw_new_capacity to retrieve the minimum
// allocation amount; this may be specialized to provide a
// customized minimum amount
- return _RW::__rw_new_capacity(0, (const deque<_TypeT, _Allocator>*)0);
+ typedef deque<_TypeT, _Allocator> _RWDeque;
+ return _RWSTD_NEW_CAPACITY (_RWDeque, (const _RWDeque*)0, 0);
}
#ifdef _RWSTDDEBUG
@@ -400,7 +401,7 @@
#endif // _RWSTD_NO_DEBUG_ITER
size_type _C_vecsize (size_type __nodes) const {
- return _RW::__rw_new_capacity (__nodes, this);
+ return _RWSTD_NEW_CAPACITY (deque, this, __nodes);
}
static size_type _C_bufsize () {
Modified: incubator/stdcxx/trunk/include/list.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/list.cc?rev=596316&r1=596315&r2=596316&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/list.cc (original)
+++ incubator/stdcxx/trunk/include/list.cc Mon Nov 19 06:52:33 2007
@@ -79,10 +79,10 @@
if(!__is_list_empty) {
if ((void*)_C_buflist) {
__next_buffer_size =
- _RW::__rw_new_capacity(_C_buflist->_C_bufsize,this);
+ _RWSTD_NEW_CAPACITY (list, this, _C_buflist->_C_bufsize);
}
else {
- __next_buffer_size = _RW::__rw_new_capacity(0,this);
+ __next_buffer_size = _RWSTD_NEW_CAPACITY (list, this, 0);
}
}
_C_buf_pointer __tmp =
Modified: incubator/stdcxx/trunk/include/rw/_tree.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_tree.cc?rev=596316&r1=596315&r2=596316&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_tree.cc (original)
+++ incubator/stdcxx/trunk/include/rw/_tree.cc Mon Nov 19 06:52:33 2007
@@ -132,7 +132,7 @@
const size_type __bufsize =
_C_buf_ptr_t () == _C_buf_list ? 0 : _C_buf_list->size;
- size_type __newsize = __rw_new_capacity (__bufsize, this);
+ size_type __newsize = _RWSTD_NEW_CAPACITY (__rb_tree, this, __bufsize);
if (__newsize <= __bufsize)
__newsize = __bufsize + 1;
Modified: incubator/stdcxx/trunk/include/vector.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/vector.cc?rev=596316&r1=596315&r2=596316&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/vector.cc (original)
+++ incubator/stdcxx/trunk/include/vector.cc Mon Nov 19 06:52:33 2007
@@ -72,8 +72,7 @@
// compute the new capacity from the greater of the current size
// and the requested size, but no greater than max_size()
- size_type __cap =
- size_type (_RW::__rw_new_capacity ((max)(size (), __n), this));
+ size_type __cap = _RWSTD_NEW_CAPACITY (vector, this, (max)(size (), __n));
// do not exceed max_size()
if (__max_size < __cap)