sso_string_base.h (__sso_string_base<>::__sso_string_base(std::initializer_list<_CharT>, const _Alloc&)): Remove.
2008-07-22 Paolo Carlini <paolo.carlini@oracle.com> * include/ext/sso_string_base.h (__sso_string_base<>::__sso_string_base(std::initializer_list<_CharT>, const _Alloc&)): Remove. * include/ext/rc_string_base.h (__rc_string_base<>::__rc_string_base(std::initializer_list<_CharT>, const _Alloc&)): Likewise. * include/ext/vstring.h (__versa_string<>::__versa_string(std::initializer_list<_CharT>, const _Alloc&)): Adjust. From-SVN: r138058
This commit is contained in:
parent
3571ae2e08
commit
1e58e43be9
4 changed files with 17 additions and 11 deletions
|
@ -1,3 +1,15 @@
|
|||
2008-07-22 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
* include/ext/sso_string_base.h
|
||||
(__sso_string_base<>::__sso_string_base(std::initializer_list<_CharT>,
|
||||
const _Alloc&)): Remove.
|
||||
* include/ext/rc_string_base.h
|
||||
(__rc_string_base<>::__rc_string_base(std::initializer_list<_CharT>,
|
||||
const _Alloc&)): Likewise.
|
||||
* include/ext/vstring.h
|
||||
(__versa_string<>::__versa_string(std::initializer_list<_CharT>,
|
||||
const _Alloc&)): Adjust.
|
||||
|
||||
2008-07-21 Jason Merrill <jason@redhat.com>
|
||||
|
||||
Add initializer_list support as per N2679.
|
||||
|
|
|
@ -309,9 +309,6 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|||
__rc_string_base(__rc_string_base&& __rcs)
|
||||
: _M_dataplus(__rcs._M_get_allocator(), __rcs._M_data())
|
||||
{ __rcs._M_data(_S_empty_rep._M_refcopy()); }
|
||||
|
||||
__rc_string_base(std::initializer_list<_CharT> __l, const _Alloc& __a)
|
||||
: _M_dataplus(__a, _S_construct(__l.begin(), __l.end(), __a)) { }
|
||||
#endif
|
||||
|
||||
__rc_string_base(size_type __n, _CharT __c, const _Alloc& __a);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Short-string-optimized versatile string base -*- C++ -*-
|
||||
|
||||
// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
|
||||
// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
|
@ -184,10 +184,6 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|||
|
||||
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
||||
__sso_string_base(__sso_string_base&& __rcs);
|
||||
|
||||
__sso_string_base(std::initializer_list<_CharT> __l, const _Alloc& __a)
|
||||
: _M_dataplus(__a, _M_local_data)
|
||||
{ _M_construct(__l.begin(), __l.end()); }
|
||||
#endif
|
||||
|
||||
__sso_string_base(size_type __n, _CharT __c, const _Alloc& __a);
|
||||
|
|
|
@ -163,8 +163,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|||
* @param l std::initializer_list of characters.
|
||||
* @param a Allocator to use (default is default allocator).
|
||||
*/
|
||||
__versa_string(std::initializer_list<_CharT> __l, const _Alloc& __a = _Alloc())
|
||||
: __vstring_base(__l, __a) { }
|
||||
__versa_string(std::initializer_list<_CharT> __l,
|
||||
const _Alloc& __a = _Alloc())
|
||||
: __vstring_base(__l.begin(), __l.end(), __a) { }
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
@ -274,7 +275,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|||
__versa_string&
|
||||
operator=(std::initializer_list<_CharT> __l)
|
||||
{
|
||||
this->assign (__l.begin(), __l.end());
|
||||
this->assign(__l.begin(), __l.end());
|
||||
return *this;
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Reference in a new issue