diff -r 4332f0f7be53 -r acd3cd4aaceb genericopenlibs/cppstdlib/stl/src/allocators.cpp --- a/genericopenlibs/cppstdlib/stl/src/allocators.cpp Thu Aug 19 11:33:45 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/src/allocators.cpp Tue Aug 31 16:54:36 2010 +0300 @@ -39,7 +39,6 @@ #include "lock_free_slist.h" - #if defined(__SYMBIAN32__WSD__) #include "libstdcppwsd.h" @@ -375,7 +374,6 @@ #endif /* _STLP_DO_CLEAN_NODE_ALLOC */ public: - /* __n must be > 0 */ static void* _M_allocate(size_t& __n); /* __p may not be 0 */ @@ -388,7 +386,6 @@ #if !defined (_STLP_USE_LOCK_FREE_IMPLEMENTATION) void* __node_alloc_impl::_M_allocate(size_t& __n) { - __n = _S_round_up(__n); _Obj * _STLP_VOLATILE * __my_free_list = _S_free_list + _S_FREELIST_INDEX(__n); _Obj *__r; @@ -411,7 +408,6 @@ } void __node_alloc_impl::_M_deallocate(void *__p, size_t __n) { - _Obj * _STLP_VOLATILE * __my_free_list = _S_free_list + _S_FREELIST_INDEX(__n); _Obj * __pobj = __STATIC_CAST(_Obj*, __p);