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

1 files changed, 21 insertions, 0 deletions

diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
index e59c21de610..60d54965332 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
@@ -14,6 +14,8 @@
 #include <string>
 #include <cassert>
 
+#include "../../min_allocator.h"
+
 template <class S>
 void
 test(S s, typename S::difference_type pos, S expected)
@@ -27,6 +29,7 @@ test(S s, typename S::difference_type pos, S expected)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S("abcde"), 0, S("bcde"));
     test(S("abcde"), 1, S("acde"));
@@ -40,4 +43,22 @@ int main()
     test(S("abcdefghijklmnopqrst"), 1, S("acdefghijklmnopqrst"));
     test(S("abcdefghijklmnopqrst"), 10, S("abcdefghijlmnopqrst"));
     test(S("abcdefghijklmnopqrst"), 19, S("abcdefghijklmnopqrs"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S("abcde"), 0, S("bcde"));
+    test(S("abcde"), 1, S("acde"));
+    test(S("abcde"), 2, S("abde"));
+    test(S("abcde"), 4, S("abcd"));
+    test(S("abcdefghij"), 0, S("bcdefghij"));
+    test(S("abcdefghij"), 1, S("acdefghij"));
+    test(S("abcdefghij"), 5, S("abcdeghij"));
+    test(S("abcdefghij"), 9, S("abcdefghi"));
+    test(S("abcdefghijklmnopqrst"), 0, S("bcdefghijklmnopqrst"));
+    test(S("abcdefghijklmnopqrst"), 1, S("acdefghijklmnopqrst"));
+    test(S("abcdefghijklmnopqrst"), 10, S("abcdefghijlmnopqrst"));
+    test(S("abcdefghijklmnopqrst"), 19, S("abcdefghijklmnopqrs"));
+    }
+#endif
 }