diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2002-01-02 13:16:56 +0100 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2002-01-02 12:16:56 +0000 |
| commit | f53d0ff1433077903c2a3e805e5f0cd79163d509 (patch) | |
| tree | ad019616814a5f2ed84eaafde669d01edf9985a9 /libstdc++-v3/include/ext/ropeimpl.h | |
| parent | d46a33b3223caf37f764ce4c26d9e293b9f26fff (diff) | |
| download | gcc-f53d0ff1433077903c2a3e805e5f0cd79163d509.zip gcc-f53d0ff1433077903c2a3e805e5f0cd79163d509.tar.gz gcc-f53d0ff1433077903c2a3e805e5f0cd79163d509.tar.bz2 | |
stl_algobase.h (copy_n + helpers, [...]): Move to...
2002-01-02 Paolo Carlini <pcarlini@unitus.it>
* include/bits/stl_algobase.h (copy_n + helpers,
lexicographical_compare_3way + helpers): Move to...
* include/ext/algorithm: ...here.
* include/bits/stl_uninitialized.h (uninitialized_copy_n +
helpers): Move to...
* include/ext/memory: ...here, new file.
* include/Makefile.am (ext_headers): Add new file.
* include/Makefile.in: Regenerate.
* testsuite/ext/headers.cc: Include <ext/memory>.
* include/backward/algobase.h: Include <ext/memory> and
<ext/algorithm>, tweak.
* include/ext/ropeimpl.h: Include <ext/memory>, tweak.
* include/ext/stl_rope.h: Include <ext/memory>, tweak.
From-SVN: r48467
Diffstat (limited to 'libstdc++-v3/include/ext/ropeimpl.h')
| -rw-r--r-- | libstdc++-v3/include/ext/ropeimpl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index 54ddc26..6132494 100644 --- a/libstdc++-v3/include/ext/ropeimpl.h +++ b/libstdc++-v3/include/ext/ropeimpl.h @@ -49,6 +49,9 @@ #include <bits/std_iostream.h> #include <bits/functexcept.h> +#include <ext/algorithm> // For copy_n and lexicographical_compare_3way +#include <ext/memory> // For uninitialized_copy_n + namespace __gnu_cxx { using std::size_t; @@ -58,8 +61,6 @@ using std::__throw_length_error; using std::__alloc; using std::_Destroy; using std::uninitialized_fill_n; -using std::lexicographical_compare_3way; -using std::uninitialized_copy_n; // Set buf_start, buf_end, and buf_ptr appropriately, filling tmp_buf // if necessary. Assumes _M_path_end[leaf_index] and leaf_pos are correct. @@ -983,7 +984,7 @@ rope<_CharT,_Alloc>::_S_flatten(_RopeRep* __r, _CharT* __buffer) case _RopeRep::_S_leaf: { _RopeLeaf* __l = (_RopeLeaf*)__r; - return std::copy_n(__l->_M_data, __l->_M_size, __buffer).second; + return copy_n(__l->_M_data, __l->_M_size, __buffer).second; } case _RopeRep::_S_function: case _RopeRep::_S_substringfn: |