LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recommit r263036 with additional inlining, so that it will continue to work with existing system dylibs. Implements LWG#2583

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@265706 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2016-04-07 18:13:41 +00:00
parent 56a0a437b7
commit f4f7d8fc96
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/string
View File

@@ -98,8 +98,10 @@ public:
basic_string(const basic_string& str); basic_string(const basic_string& str);
basic_string(basic_string&& str) basic_string(basic_string&& str)
noexcept(is_nothrow_move_constructible<allocator_type>::value); noexcept(is_nothrow_move_constructible<allocator_type>::value);
basic_string(const basic_string& str, size_type pos, size_type n = npos, basic_string(const basic_string& str, size_type pos,
const allocator_type& a = allocator_type()); const allocator_type& a = allocator_type());
basic_string(const basic_string& str, size_type pos, size_type n,
const Allocator& a = Allocator());
basic_string(const value_type* s, const allocator_type& a = allocator_type()); basic_string(const value_type* s, const allocator_type& a = allocator_type());
basic_string(const value_type* s, size_type n, const allocator_type& a = allocator_type()); basic_string(const value_type* s, size_type n, const allocator_type& a = allocator_type());
basic_string(size_type n, value_type c, const allocator_type& a = allocator_type()); basic_string(size_type n, value_type c, const allocator_type& a = allocator_type());
@@ -1397,7 +1399,10 @@ public:
basic_string(size_type __n, value_type __c); basic_string(size_type __n, value_type __c);
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
basic_string(size_type __n, value_type __c, const allocator_type& __a); basic_string(size_type __n, value_type __c, const allocator_type& __a);
basic_string(const basic_string& __str, size_type __pos, size_type __n = npos, basic_string(const basic_string& __str, size_type __pos, size_type __n,
const allocator_type& __a = allocator_type());
_LIBCPP_INLINE_VISIBILITY
basic_string(const basic_string& __str, size_type __pos,
const allocator_type& __a = allocator_type()); const allocator_type& __a = allocator_type());
template<class _InputIterator> template<class _InputIterator>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
@@ -2222,6 +2227,21 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __st
#endif #endif
} }
template <class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_INLINE_VISIBILITY
basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str, size_type __pos,
const allocator_type& __a)
: __r_(__a)
{
size_type __str_sz = __str.size();
if (__pos > __str_sz)
this->__throw_out_of_range();
__init(__str.data() + __pos, __str_sz - __pos);
#if _LIBCPP_DEBUG_LEVEL >= 2
__get_db()->__insert_c(this);
#endif
}
template <class _CharT, class _Traits, class _Allocator> template <class _CharT, class _Traits, class _Allocator>
template <class _InputIterator> template <class _InputIterator>
typename enable_if typename enable_if

27
test/std/strings/basic.string/string.cons/substr.pass.cpp
View File

@@ -11,14 +11,21 @@
// <string> // <string>
// basic_string(const basic_string<charT,traits,Allocator>& str, // basic_string(const basic_string<charT,traits,Allocator>& str,
// size_type pos, size_type n = npos, // size_type pos, size_type n,
// const Allocator& a = Allocator());
//
// basic_string(const basic_string<charT,traits,Allocator>& str,
// size_type pos,
// const Allocator& a = Allocator()); // const Allocator& a = Allocator());
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include <algorithm> #include <algorithm>
#include <vector>
#include <scoped_allocator>
#include <cassert> #include <cassert>
#include "test_macros.h"
#include "test_allocator.h" #include "test_allocator.h"
#include "min_allocator.h" #include "min_allocator.h"
@@ -91,6 +98,20 @@ test(S str, unsigned pos, unsigned n, const typename S::allocator_type& a)
} }
} }
#if TEST_STD_VER >= 11
void test2583()
{ // LWG #2583
typedef std::basic_string<char, std::char_traits<char>, test_allocator<char> > StringA;
std::vector<StringA, std::scoped_allocator_adaptor<test_allocator<StringA>>> vs;
StringA s{"1234"};
vs.emplace_back(s, 2);
try { vs.emplace_back(s, 5); }
catch (const std::out_of_range&) { return; }
assert(false);
}
#endif
int main() int main()
{ {
{ {
@@ -131,7 +152,7 @@ int main()
test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)), 50, 10, A(8)); test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)), 50, 10, A(8));
test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)), 50, 100, A(8)); test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)), 50, 100, A(8));
} }
#if __cplusplus >= 201103L #if TEST_STD_VER >= 11
{ {
typedef min_allocator<char> A; typedef min_allocator<char> A;
typedef std::basic_string<char, std::char_traits<char>, A> S; typedef std::basic_string<char, std::char_traits<char>, A> S;
@@ -170,5 +191,7 @@ int main()
test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A()), 50, 10, A()); test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A()), 50, 10, A());
test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A()), 50, 100, A()); test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A()), 50, 100, A());
} }
test2583();
#endif #endif
} }