summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/strings/basic.string/string.nonmembers
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2018-07-02 18:41:15 +0000
committerMarshall Clow <mclow.lists@gmail.com>2018-07-02 18:41:15 +0000
commit76b26852b6be6e54c86741c7c80ca6b5d74eab2e (patch)
tree59d55f14b2d3bd60b47dddd0642ebcfca0d95c1c /libcxx/test/std/strings/basic.string/string.nonmembers
parentf50ad6c311effee3bb70c3555fb6f6b0d59465b8 (diff)
downloadbcm5719-llvm-76b26852b6be6e54c86741c7c80ca6b5d74eab2e.tar.gz
bcm5719-llvm-76b26852b6be6e54c86741c7c80ca6b5d74eab2e.zip
Implement LWG 2946, 3075 and 3076. Reviewed as https://reviews.llvm.org/D48616
llvm-svn: 336132
Diffstat (limited to 'libcxx/test/std/strings/basic.string/string.nonmembers')
-rw-r--r--libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
index 73727198f28..c8b784c2465 100644
--- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
@@ -35,8 +35,8 @@ struct some_alloc
some_alloc() {}
some_alloc(const some_alloc&);
+ T *allocate(size_t);
void deallocate(void*, unsigned) {}
-
typedef std::true_type propagate_on_container_swap;
};
@@ -47,6 +47,7 @@ struct some_alloc2
some_alloc2() {}
some_alloc2(const some_alloc2&);
+ T *allocate(size_t);
void deallocate(void*, unsigned) {}
typedef std::false_type propagate_on_container_swap;
OpenPOWER on IntegriCloud