diff options
| author | Phil Edwards <pme@gcc.gnu.org> | 2001-12-06 20:29:31 +0000 |
|---|---|---|
| committer | Phil Edwards <pme@gcc.gnu.org> | 2001-12-06 20:29:31 +0000 |
| commit | 9d6a24bd514b4056553f49053d3c4b3862401207 (patch) | |
| tree | ad132ddb89985d54eccbe8585fd27363c73e2cfd /libstdc++-v3/include/ext/ropeimpl.h | |
| parent | a5eb2838c349eb42dee871dd3b20771e2bde3361 (diff) | |
| download | gcc-9d6a24bd514b4056553f49053d3c4b3862401207.zip gcc-9d6a24bd514b4056553f49053d3c4b3862401207.tar.gz gcc-9d6a24bd514b4056553f49053d3c4b3862401207.tar.bz2 | |
std_bitset.h: Use GLIBCPP in multiple-inclusion guard.
2001-12-06 Phil Edwards <pme@gcc.gnu.org>
* include/bits/std_bitset.h: Use GLIBCPP in multiple-inclusion guard.
* include/bits/stl_algo.h: Likewise.
* include/bits/stl_algobase.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
* include/bits/stl_deque.h: Likewise.
* include/bits/stl_function.h: Likewise.
* include/bits/stl_iterator.h: Likewise.
* include/bits/stl_iterator_base_funcs.h: Likewise.
* include/bits/stl_iterator_base_types.h: Likewise.
* include/bits/stl_list.h: Likewise.
* include/bits/stl_multimap.h: Likewise.
* include/bits/stl_multiset.h: Likewise.
* include/bits/stl_pair.h: Likewise.
* include/bits/stl_queue.h: Likewise.
* include/bits/stl_set.h: Likewise.
* include/bits/stl_stack.h: Likewise.
* include/bits/stl_tempbuf.h: Likewise.
* include/bits/stl_tree.h: Likewise.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_alloc.h: Use our own multiple inclusion guards.
Doxygenate more comments. Correct historical artifacts in comments.
(alloc, single_alloc): Uglify non-standard names.
(__default_alloc_template::_NFREELISTS): Calculate from other
parameters.
(__default_alloc_template::_S_free_list): Remove SunPro workaround.
(__default_alloc_template::_Lock): Mark as "unused".
* include/backward/alloc.h: Update.
* include/bits/stl_bvector.h: Likewise.
* include/ext/ropeimpl.h: Likewise.
* include/ext/stl_hashtable.h: Likewise.
From-SVN: r47729
Diffstat (limited to 'libstdc++-v3/include/ext/ropeimpl.h')
| -rw-r--r-- | libstdc++-v3/include/ext/ropeimpl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index 4d15517..49e537b 100644 --- a/libstdc++-v3/include/ext/ropeimpl.h +++ b/libstdc++-v3/include/ext/ropeimpl.h @@ -863,15 +863,15 @@ bool rope<_CharT, _Alloc>::_S_apply_to_pieces( size_t __len = __end - __begin; bool __result; _CharT* __buffer = - (_CharT*)alloc::allocate(__len * sizeof(_CharT)); + (_CharT*)__alloc::allocate(__len * sizeof(_CharT)); try { (*(__f->_M_fn))(__begin, __len, __buffer); __result = __c(__buffer, __len); - alloc::deallocate(__buffer, __len * sizeof(_CharT)); + __alloc::deallocate(__buffer, __len * sizeof(_CharT)); } catch(...) { - alloc::deallocate(__buffer, __len * sizeof(_CharT)); + __alloc::deallocate(__buffer, __len * sizeof(_CharT)); __throw_exception_again; } return __result; |