summaryrefslogtreecommitdiffstats
path: root/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2013-12-03 00:18:10 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-12-03 00:18:10 +0000
commitc3deeb5f89f0fa733e4e2c4d260d6f816d6b1b5e (patch)
treea59c2eb3bc80868163acd2b90331ceb4fed6fb67 /libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
parentba71833846c66d80ccc52c3fec57772f5995bf5b (diff)
downloadbcm5719-llvm-c3deeb5f89f0fa733e4e2c4d260d6f816d6b1b5e.tar.gz
bcm5719-llvm-c3deeb5f89f0fa733e4e2c4d260d6f816d6b1b5e.zip
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
Diffstat (limited to 'libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp')
-rw-r--r--libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
index 8aa88c9fe72..f6e9e00e590 100644
--- a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class charT>
OpenPOWER on IntegriCloud