From eec721826cc35a0c08dc5bc54db9a51dbd4fa361 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Fri, 28 Jun 2013 16:59:19 +0000 Subject: Implement full support for non-pointer pointers in custom allocators for string. This completes the custom pointer support for the entire library. llvm-svn: 185167 --- .../string.modifiers/string_assign/pointer.pass.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp') diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp index 9370666a817..f9d0614126e 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "../../min_allocator.h" + template void test(S s, const typename S::value_type* str, S expected) @@ -26,6 +28,7 @@ test(S s, const typename S::value_type* str, S expected) int main() { + { typedef std::string S; test(S(), "", S()); test(S(), "12345", S("12345")); @@ -39,4 +42,22 @@ int main() test(S("12345678901234567890"), "12345", S("12345")); test(S("12345678901234567890"), "12345678901234567890", S("12345678901234567890")); + } +#if __cplusplus >= 201103L + { + typedef std::basic_string, min_allocator> S; + test(S(), "", S()); + test(S(), "12345", S("12345")); + test(S(), "12345678901234567890", S("12345678901234567890")); + + test(S("12345"), "", S()); + test(S("12345"), "12345", S("12345")); + test(S("12345"), "1234567890", S("1234567890")); + + test(S("12345678901234567890"), "", S()); + test(S("12345678901234567890"), "12345", S("12345")); + test(S("12345678901234567890"), "12345678901234567890", + S("12345678901234567890")); + } +#endif } -- cgit v1.2.3