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-11-26 20:58:02 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-11-26 20:58:02 +0000
commite34f6f6a12ab7e203144ff04b2d1940f52e2ec9b (patch)
tree887780bdf017f8972bf1a1de936ff490dd72f58a /libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
parent2c9838f622e53df0095841634b30a5306592b434 (diff)
downloadbcm5719-llvm-e34f6f6a12ab7e203144ff04b2d1940f52e2ec9b.tar.gz
bcm5719-llvm-e34f6f6a12ab7e203144ff04b2d1940f52e2ec9b.zip
There were two identical files named 'min_allocator.h'. Move one of them to /support and delete the other. Then adjust all the tests that used them to include the moved one. No functionality change.
llvm-svn: 195785
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 befb143d973..8aa88c9fe72 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
@@ -17,7 +17,7 @@
#include <cassert>
#include "../test_allocator.h"
-#include "../min_allocator.h"
+#include "min_allocator.h"
template <class charT>
void
OpenPOWER on IntegriCloud