Skip to content

R
riscv-gcc-1
Commit 95c952c5 by Ollie Wild Committed by Ollie Wild
Options

sso_string_base.h (__sso_string_base<>::_M_construct): Fix unqualified lookup. 

	* include/ext/sso_string_base.h (__sso_string_base<>::_M_construct):
	Fix unqualified lookup.
	(__sso_string_base<>::_M_construct): Likewise.
	(__sso_string_base<>::_M_construct): Likewise.
	(__sso_string_base<>::_M_assign): Likewise.
	(__sso_string_base<>::_M_reserve): Likewise.
	(__sso_string_base<>::_M_mutate): Likewise.
	(__sso_string_base<>::_M_erase): Likewise.
	* include/ext/vstring.h (__versa_string<>::replace): Likewise.
	(__versa_string<>::compare): Likewise.
	* include/ext/vstring.tcc (__versa_string<>::compare): Likewise.
	(__versa_string<>::compare): Likewise.
	(__versa_string<>::compare): Likewise.
	(__versa_string<>::compare): Likewise.
	(__versa_string<>::compare): Likewise.

From-SVN: r173257
parent 47c94d21
Showing with 36 additions and 19 deletions
libstdc++-v3/ChangeLog
2011-05-02 Ollie Wild <aaw@google.com>
* include/ext/sso_string_base.h (__sso_string_base<>::_M_construct):
Fix unqualified lookup.
(__sso_string_base<>::_M_construct): Likewise.
(__sso_string_base<>::_M_construct): Likewise.
(__sso_string_base<>::_M_assign): Likewise.
(__sso_string_base<>::_M_reserve): Likewise.
(__sso_string_base<>::_M_mutate): Likewise.
(__sso_string_base<>::_M_erase): Likewise.
* include/ext/vstring.h (__versa_string<>::replace): Likewise.
(__versa_string<>::compare): Likewise.
* include/ext/vstring.tcc (__versa_string<>::compare): Likewise.
(__versa_string<>::compare): Likewise.
(__versa_string<>::compare): Likewise.
(__versa_string<>::compare): Likewise.
(__versa_string<>::compare): Likewise.
2011-05-02 Jonathan Wakely <jwakely.gcc@gmail.com> 2011-05-02 Jonathan Wakely <jwakely.gcc@gmail.com>
* doc/xml/manual/status_cxx200x.xml: Update to reflect current status * doc/xml/manual/status_cxx200x.xml: Update to reflect current status
......
libstdc++-v3/include/ext/sso_string_base.h
...@@ -411,7 +411,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -411,7 +411,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Allocate more space. // Allocate more space.
__capacity = __len + 1; __capacity = __len + 1;
_CharT* __another = _M_create(__capacity, __len); _CharT* __another = _M_create(__capacity, __len);
_S_copy(__another, _M_data(), __len); this->_S_copy(__another, _M_data(), __len);
_M_dispose(); _M_dispose();
_M_data(__another); _M_data(__another);
_M_capacity(__capacity); _M_capacity(__capacity);
...@@ -451,7 +451,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -451,7 +451,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Check for out_of_range and length_error exceptions. // Check for out_of_range and length_error exceptions.
__try __try
{ _S_copy_chars(_M_data(), __beg, __end); } { this->_S_copy_chars(_M_data(), __beg, __end); }
__catch(...) __catch(...)
{ {
_M_dispose(); _M_dispose();
...@@ -473,7 +473,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -473,7 +473,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
if (__n) if (__n)
_S_assign(_M_data(), __n, __c); this->_S_assign(_M_data(), __n, __c);
_M_set_length(__n); _M_set_length(__n);
} }
...@@ -498,7 +498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -498,7 +498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
if (__rsize) if (__rsize)
_S_copy(_M_data(), __rcs._M_data(), __rsize); this->_S_copy(_M_data(), __rcs._M_data(), __rsize);
_M_set_length(__rsize); _M_set_length(__rsize);
} }
...@@ -520,14 +520,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -520,14 +520,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|| __res > size_type(_S_local_capacity)) || __res > size_type(_S_local_capacity))
{ {
_CharT* __tmp = _M_create(__res, __capacity); _CharT* __tmp = _M_create(__res, __capacity);
_S_copy(__tmp, _M_data(), _M_length() + 1); this->_S_copy(__tmp, _M_data(), _M_length() + 1);
_M_dispose(); _M_dispose();
_M_data(__tmp); _M_data(__tmp);
_M_capacity(__res); _M_capacity(__res);
} }
else if (!_M_is_local()) else if (!_M_is_local())
{ {
_S_copy(_M_local_data, _M_data(), _M_length() + 1); this->_S_copy(_M_local_data, _M_data(), _M_length() + 1);
_M_destroy(__capacity); _M_destroy(__capacity);
_M_data(_M_local_data); _M_data(_M_local_data);
} }
...@@ -546,12 +546,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -546,12 +546,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_CharT* __r = _M_create(__new_capacity, _M_capacity()); _CharT* __r = _M_create(__new_capacity, _M_capacity());
if (__pos) if (__pos)
_S_copy(__r, _M_data(), __pos); this->_S_copy(__r, _M_data(), __pos);
if (__s && __len2) if (__s && __len2)
_S_copy(__r + __pos, __s, __len2); this->_S_copy(__r + __pos, __s, __len2);
if (__how_much) if (__how_much)
_S_copy(__r + __pos + __len2, this->_S_copy(__r + __pos + __len2,
_M_data() + __pos + __len1, __how_much); _M_data() + __pos + __len1, __how_much);
_M_dispose(); _M_dispose();
_M_data(__r); _M_data(__r);
...@@ -566,8 +566,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -566,8 +566,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const size_type __how_much = _M_length() - __pos - __n; const size_type __how_much = _M_length() - __pos - __n;
if (__how_much && __n) if (__how_much && __n)
_S_move(_M_data() + __pos, _M_data() + __pos + __n, this->_S_move(_M_data() + __pos, _M_data() + __pos + __n, __how_much);
__how_much);
_M_set_length(_M_length() - __n); _M_set_length(_M_length() - __n);
} }
......
libstdc++-v3/include/ext/vstring.h
...@@ -1359,7 +1359,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1359,7 +1359,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
&& __i2 <= _M_iend()); && __i2 <= _M_iend());
__glibcxx_requires_valid_range(__k1, __k2); __glibcxx_requires_valid_range(__k1, __k2);
typedef typename std::__is_integer<_InputIterator>::__type _Integral; typedef typename std::__is_integer<_InputIterator>::__type _Integral;
return _M_replace_dispatch(__i1, __i2, __k1, __k2, _Integral()); return this->_M_replace_dispatch(__i1, __i2, __k1, __k2, _Integral());
} }
// Specializations for the common case of pointer and iterator: // Specializations for the common case of pointer and iterator:
...@@ -1914,7 +1914,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1914,7 +1914,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
int __r = traits_type::compare(this->_M_data(), __str.data(), __len); int __r = traits_type::compare(this->_M_data(), __str.data(), __len);
if (!__r) if (!__r)
__r = _S_compare(__size, __osize); __r = this->_S_compare(__size, __osize);
return __r; return __r;
} }
......
libstdc++-v3/include/ext/vstring.tcc
...@@ -466,7 +466,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -466,7 +466,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
int __r = traits_type::compare(this->_M_data() + __pos, int __r = traits_type::compare(this->_M_data() + __pos,
__str.data(), __len); __str.data(), __len);
if (!__r) if (!__r)
__r = _S_compare(__n, __osize); __r = this->_S_compare(__n, __osize);
return __r; return __r;
} }
...@@ -485,7 +485,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -485,7 +485,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
int __r = traits_type::compare(this->_M_data() + __pos1, int __r = traits_type::compare(this->_M_data() + __pos1,
__str.data() + __pos2, __len); __str.data() + __pos2, __len);
if (!__r) if (!__r)
__r = _S_compare(__n1, __n2); __r = this->_S_compare(__n1, __n2);
return __r; return __r;
} }
...@@ -501,7 +501,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -501,7 +501,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const size_type __len = std::min(__size, __osize); const size_type __len = std::min(__size, __osize);
int __r = traits_type::compare(this->_M_data(), __s, __len); int __r = traits_type::compare(this->_M_data(), __s, __len);
if (!__r) if (!__r)
__r = _S_compare(__size, __osize); __r = this->_S_compare(__size, __osize);
return __r; return __r;
} }
...@@ -518,7 +518,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -518,7 +518,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const size_type __len = std::min(__n1, __osize); const size_type __len = std::min(__n1, __osize);
int __r = traits_type::compare(this->_M_data() + __pos, __s, __len); int __r = traits_type::compare(this->_M_data() + __pos, __s, __len);
if (!__r) if (!__r)
__r = _S_compare(__n1, __osize); __r = this->_S_compare(__n1, __osize);
return __r; return __r;
} }
...@@ -535,7 +535,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -535,7 +535,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const size_type __len = std::min(__n1, __n2); const size_type __len = std::min(__n1, __n2);
int __r = traits_type::compare(this->_M_data() + __pos, __s, __len); int __r = traits_type::compare(this->_M_data() + __pos, __s, __len);
if (!__r) if (!__r)
__r = _S_compare(__n1, __n2); __r = this->_S_compare(__n1, __n2);
return __r; return __r;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment