diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2013-11-26 20:58:02 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2013-11-26 20:58:02 +0000 |
| commit | e34f6f6a12ab7e203144ff04b2d1940f52e2ec9b (patch) | |
| tree | 887780bdf017f8972bf1a1de936ff490dd72f58a /libcxx/test/strings/basic.string/string.modifiers/string_append | |
| parent | 2c9838f622e53df0095841634b30a5306592b434 (diff) | |
| download | bcm5719-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.modifiers/string_append')
8 files changed, 8 insertions, 8 deletions
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp index 0a1a412921d..fb28e498c32 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp index 1e5307b2dca..3bf2afa2552 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp index ab813612058..5ae15f0a0a4 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp index 64f7bb6f6f0..5a9e8e2b814 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp index 7a6a276fe7a..b0a2eb5e5cb 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp index 920a0bc7ea2..00e6ae375cc 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp index 2568af4ef06..31f174b4f30 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp index 9f4081f4f89..ac74f202654 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void |
