From e34f6f6a12ab7e203144ff04b2d1940f52e2ec9b Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 26 Nov 2013 20:58:02 +0000 Subject: 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 --- .../string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp | 2 +- .../string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp | 2 +- .../string.modifiers/string_replace/iter_iter_pointer.pass.cpp | 2 +- .../string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp | 2 +- .../string.modifiers/string_replace/iter_iter_size_char.pass.cpp | 2 +- .../string.modifiers/string_replace/iter_iter_string.pass.cpp | 2 +- .../string.modifiers/string_replace/size_size_pointer.pass.cpp | 2 +- .../string.modifiers/string_replace/size_size_pointer_size.pass.cpp | 2 +- .../string.modifiers/string_replace/size_size_size_char.pass.cpp | 2 +- .../string.modifiers/string_replace/size_size_string.pass.cpp | 2 +- .../string.modifiers/string_replace/size_size_string_size_size.pass.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'libcxx/test/strings/basic.string/string.modifiers/string_replace') diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp index 6bc7148be4b..20455b258c0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp index bdc4519305b..9295c5bde9f 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp index 6d552f0e747..cb4ce61d094 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp index a8968ef7a3a..b1d6ab1ba57 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp index b1b3d96ff94..b0e2234a7e5 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp index 95ef8be2de3..0f95492fdb1 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp index 4dd1a828af7..914081bbc45 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp index 0b4aeafdab1..d9870428732 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp index f8e13b83b58..33f57fd3b86 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp index 08e906884df..c130780dc9d 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp index 099980015ee..25e5c4433cc 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void -- cgit v1.2.3