summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2016-05-12 14:31:35 +0000
committerMarshall Clow <mclow.lists@gmail.com>2016-05-12 14:31:35 +0000
commit1168ca925cad2186772ff1692279846635baa1a0 (patch)
treeea693aa4ff41aa38fa7644596ea23c23ee41566a /libcxx/test/std/utilities
parent9ede03d4f2a667259f3030c433a2360008348e48 (diff)
downloadbcm5719-llvm-1168ca925cad2186772ff1692279846635baa1a0.tar.gz
bcm5719-llvm-1168ca925cad2186772ff1692279846635baa1a0.zip
Apply D20014 - fix a missing return in a test. Fixes PR#27720
llvm-svn: 269298
Diffstat (limited to 'libcxx/test/std/utilities')
-rw-r--r--libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp b/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
index 2fab34b90cf..bd32bc34e7a 100644
--- a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
@@ -30,7 +30,7 @@ struct C {
};
struct D {
- static int allocator_type() {}
+ static int allocator_type() { return 0; }
};
struct E {
OpenPOWER on IntegriCloud