@@ -48,7 +48,8 @@ public:
4848 size_type length() const noexcept;
4949
5050 typedef __iterator<charT> iterator;
51- typedef __iterator<const charT> const_iterator;
51+ typedef __iterator<const charT> __const_iterator;
52+ typedef __const_iterator const_iterator;
5253
5354 iterator begin();
5455 iterator end();
@@ -111,17 +112,17 @@ public:
111112 size_type n2);
112113 basic_string &replace(size_type pos, size_type n1, const charT *s);
113114 basic_string &replace(size_type pos, size_type n1, size_type n2, charT c);
114- basic_string &replace(const_iterator i1, const_iterator i2,
115+ basic_string &replace(__const_iterator i1, __const_iterator i2,
115116 const basic_string &str);
116- basic_string &replace(const_iterator i1, const_iterator i2, const charT *s,
117+ basic_string &replace(__const_iterator i1, __const_iterator i2, const charT *s,
117118 size_type n);
118- basic_string &replace(const_iterator i1, const_iterator i2, const charT *s);
119- basic_string &replace(const_iterator i1, const_iterator i2, size_type n,
119+ basic_string &replace(__const_iterator i1, __const_iterator i2, const charT *s);
120+ basic_string &replace(__const_iterator i1, __const_iterator i2, size_type n,
120121 charT c);
121122 template <class InputIterator>
122- basic_string &replace(const_iterator i1, const_iterator i2, InputIterator j1,
123+ basic_string &replace(__const_iterator i1, __const_iterator i2, InputIterator j1,
123124 InputIterator j2);
124- basic_string &replace(const_iterator, const_iterator ,
125+ basic_string &replace(__const_iterator, __const_iterator ,
125126 initializer_list<charT>);
126127
127128 size_type copy(charT *s, size_type n, size_type pos = 0) const;
0 commit comments