From c3deeb5f89f0fa733e4e2c4d260d6f816d6b1b5e Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 3 Dec 2013 00:18:10 +0000 Subject: Found six (nmostly) identical files named 'test_allocator.h' in the libcxx test suite. Moved one to /support, made it a superset, and removed all but one of the others, and iupdated all the includes. Left the odd one (thread/futures/test_allocator.h) for later. llvm-svn: 196174 --- .../containers/associative/multimap/multimap.cons/copy_assign.pass.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp') diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp index c7a0e49588f..f00f0fed166 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp @@ -17,7 +17,7 @@ #include #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() -- cgit v1.2.3