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
diff --git a/libcxx/test/strings/basic.string/string.access/at.pass.cpp b/libcxx/test/strings/basic.string/string.access/at.pass.cpp
index 5be117b..e24b560 100644
--- a/libcxx/test/strings/basic.string/string.access/at.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/at.pass.cpp
@@ -16,6 +16,8 @@
#include <stdexcept>
#include <cassert>
+#include "../min_allocator.h"
+
template <class S>
void
test(S s, typename S::size_type pos)
@@ -35,10 +37,22 @@
int main()
{
+ {
typedef std::string S;
test(S(), 0);
test(S("123"), 0);
test(S("123"), 1);
test(S("123"), 2);
test(S("123"), 3);
+ }
+#if __cplusplus >= 201103L
+ {
+ typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+ test(S(), 0);
+ test(S("123"), 0);
+ test(S("123"), 1);
+ test(S("123"), 2);
+ test(S("123"), 3);
+ }
+#endif
}
diff --git a/libcxx/test/strings/basic.string/string.access/back.pass.cpp b/libcxx/test/strings/basic.string/string.access/back.pass.cpp
index 1f70b44..f241d4d 100644
--- a/libcxx/test/strings/basic.string/string.access/back.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/back.pass.cpp
@@ -15,6 +15,8 @@
#include <string>
#include <cassert>
+#include "../min_allocator.h"
+
template <class S>
void
test(S s)
@@ -28,7 +30,16 @@
int main()
{
+ {
typedef std::string S;
test(S("1"));
test(S("1234567890123456789012345678901234567890"));
+ }
+#if __cplusplus >= 201103L
+ {
+ typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+ test(S("1"));
+ test(S("1234567890123456789012345678901234567890"));
+ }
+#endif
}
diff --git a/libcxx/test/strings/basic.string/string.access/front.pass.cpp b/libcxx/test/strings/basic.string/string.access/front.pass.cpp
index e49ed69..ecfafb5 100644
--- a/libcxx/test/strings/basic.string/string.access/front.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/front.pass.cpp
@@ -15,6 +15,8 @@
#include <string>
#include <cassert>
+#include "../min_allocator.h"
+
template <class S>
void
test(S s)
@@ -28,7 +30,16 @@
int main()
{
+ {
typedef std::string S;
test(S("1"));
test(S("1234567890123456789012345678901234567890"));
+ }
+#if __cplusplus >= 201103L
+ {
+ typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+ test(S("1"));
+ test(S("1234567890123456789012345678901234567890"));
+ }
+#endif
}
diff --git a/libcxx/test/strings/basic.string/string.access/index.pass.cpp b/libcxx/test/strings/basic.string/string.access/index.pass.cpp
index 50ee6fe..b564353 100644
--- a/libcxx/test/strings/basic.string/string.access/index.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.access/index.pass.cpp
@@ -15,8 +15,11 @@
#include <string>
#include <cassert>
+#include "../min_allocator.h"
+
int main()
{
+ {
typedef std::string S;
S s("0123456789");
const S& cs = s;
@@ -28,4 +31,20 @@
assert(cs[cs.size()] == '\0');
const S s2 = S();
assert(s2[0] == '\0');
+ }
+#if __cplusplus >= 201103L
+ {
+ typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+ S s("0123456789");
+ const S& cs = s;
+ for (S::size_type i = 0; i < cs.size(); ++i)
+ {
+ assert(s[i] == '0' + i);
+ assert(cs[i] == s[i]);
+ }
+ assert(cs[cs.size()] == '\0');
+ const S s2 = S();
+ assert(s2[0] == '\0');
+ }
+#endif
}