Index: test/std/containers/stack_allocator.h
===================================================================
--- test/std/containers/stack_allocator.h
+++ test/std/containers/stack_allocator.h
@@ -13,6 +13,18 @@
 #include <cstddef>
 #include <new>
 
+#ifdef TEST_STACK_ALLOCATOR_WORKAROUND
+
+#include <memory>
+
+template <class T, std::size_t N>
+using stack_allocator = std::allocator<T>;
+
+// This is a temporary workaround for library implementations
+// that can't tolerate the nonconformant stack_allocator below.
+
+#else  // TEST_STACK_ALLOCATOR_WORKAROUND
+
 template <class T, std::size_t N>
 class stack_allocator
 {
@@ -63,4 +75,6 @@
 void
 swap(stack_allocator<T, N>& x, stack_allocator<T, N>& y) {}
 
+#endif  // TEST_STACK_ALLOCATOR_WORKAROUND
+
 #endif  // STACK_ALLOCATOR_H