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

8 files changed, 88 insertions, 0 deletions

diff --git a/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp
index 1067052692d..fddd6e675bb 100644
--- a/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp
@@ -15,6 +15,8 @@
 #include <string>
 #include <cassert>
 
+#include "../min_allocator.h"
+
 template <class S>
 void
 test(S s)
@@ -31,7 +33,16 @@ test(S s)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S());
     test(S("123"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S());
+    test(S("123"));
+    }
+#endif
 }
diff --git a/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp
index 5f170de8af6..9a9f042d428 100644
--- a/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp
@@ -14,6 +14,8 @@
 #include <string>
 #include <cassert>
 
+#include "../min_allocator.h"
+
 template <class S>
 void
 test(const S& s)
@@ -28,7 +30,16 @@ test(const S& s)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S());
     test(S("123"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S());
+    test(S("123"));
+    }
+#endif
 }
diff --git a/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp
index fb145d6a31d..cca6ff622d7 100644
--- a/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp
@@ -14,6 +14,8 @@
 #include <string>
 #include <cassert>
 
+#include "../min_allocator.h"
+
 template <class S>
 void
 test(const S& s)
@@ -24,7 +26,16 @@ test(const S& s)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S());
     test(S("123"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S());
+    test(S("123"));
+    }
+#endif
 }
diff --git a/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp
index d8b42945139..dbff2a57899 100644
--- a/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp
@@ -14,6 +14,8 @@
 #include <string>
 #include <cassert>
 
+#include "../min_allocator.h"
+
 template <class S>
 void
 test(const S& s)
@@ -28,7 +30,16 @@ test(const S& s)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S());
     test(S("123"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S());
+    test(S("123"));
+    }
+#endif
 }
diff --git a/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp
index 8413bbe8c4e..109c583f070 100644
--- a/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp
@@ -14,6 +14,8 @@
 #include <string>
 #include <cassert>
 
+#include "../min_allocator.h"
+
 template <class S>
 void
 test(const S& s)
@@ -24,7 +26,16 @@ test(const S& s)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S());
     test(S("123"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S());
+    test(S("123"));
+    }
+#endif
 }
diff --git a/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp
index fc36ba9e43e..b3732da3e24 100644
--- a/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp
@@ -15,6 +15,8 @@
 #include <string>
 #include <cassert>
 
+#include "../min_allocator.h"
+
 template <class S>
 void
 test(S s)
@@ -33,7 +35,16 @@ test(S s)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S());
     test(S("123"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S());
+    test(S("123"));
+    }
+#endif
 }
diff --git a/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp
index 7f8c3423ca1..edb02d719ab 100644
--- a/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp
@@ -15,6 +15,8 @@
 #include <string>
 #include <cassert>
 
+#include "../min_allocator.h"
+
 template <class S>
 void
 test(S s)
@@ -31,7 +33,16 @@ test(S s)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S());
     test(S("123"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S());
+    test(S("123"));
+    }
+#endif
 }
diff --git a/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp
index c0c1070f55a..630565b7d77 100644
--- a/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp
@@ -15,6 +15,8 @@
 #include <string>
 #include <cassert>
 
+#include "../min_allocator.h"
+
 template <class S>
 void
 test(S s)
@@ -33,7 +35,16 @@ test(S s)
 
 int main()
 {
+    {
     typedef std::string S;
     test(S());
     test(S("123"));
+    }
+#if __cplusplus >= 201103L
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test(S());
+    test(S("123"));
+    }
+#endif
 }