diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2005-05-28 21:57:03 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2005-05-28 21:57:03 +0000 |
| commit | 6be8b52474f98eab9b3c490169627b9d1ece43df (patch) | |
| tree | 81a0d6886d0cf976642a98f38627e30489df1086 /libstdc++-v3/include/bits/basic_string.h | |
| parent | 76b8a7a14335e0b10318353efff63b90898ff8ce (diff) | |
| download | gcc-6be8b52474f98eab9b3c490169627b9d1ece43df.zip gcc-6be8b52474f98eab9b3c490169627b9d1ece43df.tar.gz gcc-6be8b52474f98eab9b3c490169627b9d1ece43df.tar.bz2 | |
revert: re PR libstdc++/19495 (basic_string::_M_rep() can produce an unnaturally aligned pointer to _Rep)
2005-05-28 Paolo Carlini <pcarlini@suse.de>
Revert:
2005-05-18 Paolo Carlini <pcarlini@suse.de>
Nathan Myers <ncm@cantrip.org>
PR libstdc++/19495
* include/bits/basic_string.h (_Raw_bytes_alloc): Rebind to
size_type instead of char and rename to _Raw_alloc.
* include/bits/basic_string.tcc (_Rep::_M_destroy, _Rep::_S_create):
Use the above.
* src/bitmap_allocator.cc: Add instantiation for size_type.
* src/mt_allocator.cc: Likewise.
* src/pool_allocator.cc: Likewise.
* include/ext/array_allocator.h: Tweak slightly, avoid assuming
the existence of an _Array::begin() and size() members.
* testsuite/ext/array_allocator/2.cc: Tweak to use an allocator
of size_type, instead of char, thus avoiding problems with
rebinds, not treated correctly by array_allocator.
From-SVN: r100304
Diffstat (limited to 'libstdc++-v3/include/bits/basic_string.h')
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 001a68f..c889ce6 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -151,7 +151,7 @@ namespace std struct _Rep : _Rep_base { // Types: - typedef typename _Alloc::template rebind<size_type>::other _Raw_alloc; + typedef typename _Alloc::template rebind<char>::other _Raw_bytes_alloc; // (Public) Data members: |