1 files changed, 126 insertions, 56 deletions
diff --git a/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp b/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp
index 585c341cd23..537ccd3aff1 100644
--- a/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp
@@ -17,68 +17,138 @@
 #include <set>
 #include <cassert>
 
+#include "../../min_allocator.h"
+
 int main()
 {
-    typedef int V;
-    typedef std::multiset<int> M;
     {
-        typedef M::iterator R;
-        V ar[] =
+        typedef int V;
+        typedef std::multiset<int> M;
+        {
+            typedef M::iterator R;
+            V ar[] =
+            {
+                5,
+                5,
+                5,
+                7,
+                7,
+                7,
+                9,
+                9,
+                9
+            };
+            M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
+            R r = m.lower_bound(4);
+            assert(r == next(m.begin(), 0));
+            r = m.lower_bound(5);
+            assert(r == next(m.begin(), 0));
+            r = m.lower_bound(6);
+            assert(r == next(m.begin(), 3));
+            r = m.lower_bound(7);
+            assert(r == next(m.begin(), 3));
+            r = m.lower_bound(8);
+            assert(r == next(m.begin(), 6));
+            r = m.lower_bound(9);
+            assert(r == next(m.begin(), 6));
+            r = m.lower_bound(11);
+            assert(r == next(m.begin(), 9));
+        }
         {
-            5,
-            5,
-            5,
-            7,
-            7,
-            7,
-            9,
-            9,
-            9
-        };
-        M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
-        R r = m.lower_bound(4);
-        assert(r == next(m.begin(), 0));
-        r = m.lower_bound(5);
-        assert(r == next(m.begin(), 0));
-        r = m.lower_bound(6);
-        assert(r == next(m.begin(), 3));
-        r = m.lower_bound(7);
-        assert(r == next(m.begin(), 3));
-        r = m.lower_bound(8);
-        assert(r == next(m.begin(), 6));
-        r = m.lower_bound(9);
-        assert(r == next(m.begin(), 6));
-        r = m.lower_bound(11);
-        assert(r == next(m.begin(), 9));
+            typedef M::const_iterator R;
+            V ar[] =
+            {
+                5,
+                5,
+                5,
+                7,
+                7,
+                7,
+                9,
+                9,
+                9
+            };
+            const M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
+            R r = m.lower_bound(4);
+            assert(r == next(m.begin(), 0));
+            r = m.lower_bound(5);
+            assert(r == next(m.begin(), 0));
+            r = m.lower_bound(6);
+            assert(r == next(m.begin(), 3));
+            r = m.lower_bound(7);
+            assert(r == next(m.begin(), 3));
+            r = m.lower_bound(8);
+            assert(r == next(m.begin(), 6));
+            r = m.lower_bound(9);
+            assert(r == next(m.begin(), 6));
+            r = m.lower_bound(11);
+            assert(r == next(m.begin(), 9));
+        }
     }
+#if __cplusplus >= 201103L
     {
-        typedef M::const_iterator R;
-        V ar[] =
+        typedef int V;
+        typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
+        {
+            typedef M::iterator R;
+            V ar[] =
+            {
+                5,
+                5,
+                5,
+                7,
+                7,
+                7,
+                9,
+                9,
+                9
+            };
+            M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
+            R r = m.lower_bound(4);
+            assert(r == next(m.begin(), 0));
+            r = m.lower_bound(5);
+            assert(r == next(m.begin(), 0));
+            r = m.lower_bound(6);
+            assert(r == next(m.begin(), 3));
+            r = m.lower_bound(7);
+            assert(r == next(m.begin(), 3));
+            r = m.lower_bound(8);
+            assert(r == next(m.begin(), 6));
+            r = m.lower_bound(9);
+            assert(r == next(m.begin(), 6));
+            r = m.lower_bound(11);
+            assert(r == next(m.begin(), 9));
+        }
         {
-            5,
-            5,
-            5,
-            7,
-            7,
-            7,
-            9,
-            9,
-            9
-        };
-        const M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
-        R r = m.lower_bound(4);
-        assert(r == next(m.begin(), 0));
-        r = m.lower_bound(5);
-        assert(r == next(m.begin(), 0));
-        r = m.lower_bound(6);
-        assert(r == next(m.begin(), 3));
-        r = m.lower_bound(7);
-        assert(r == next(m.begin(), 3));
-        r = m.lower_bound(8);
-        assert(r == next(m.begin(), 6));
-        r = m.lower_bound(9);
-        assert(r == next(m.begin(), 6));
-        r = m.lower_bound(11);
-        assert(r == next(m.begin(), 9));
+            typedef M::const_iterator R;
+            V ar[] =
+            {
+                5,
+                5,
+                5,
+                7,
+                7,
+                7,
+                9,
+                9,
+                9
+            };
+            const M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
+            R r = m.lower_bound(4);
+            assert(r == next(m.begin(), 0));
+            r = m.lower_bound(5);
+            assert(r == next(m.begin(), 0));
+            r = m.lower_bound(6);
+            assert(r == next(m.begin(), 3));
+            r = m.lower_bound(7);
+            assert(r == next(m.begin(), 3));
+            r = m.lower_bound(8);
+            assert(r == next(m.begin(), 6));
+            r = m.lower_bound(9);
+            assert(r == next(m.begin(), 6));
+            r = m.lower_bound(11);
+            assert(r == next(m.begin(), 9));
+        }
     }
+#endif
 }