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 --- .../basic.string/string.modifiers/string_insert/iter_char.pass.cpp | 2 +- .../string.modifiers/string_insert/iter_initializer_list.pass.cpp | 2 +- .../basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp | 2 +- .../basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp | 2 +- .../basic.string/string.modifiers/string_insert/size_pointer.pass.cpp | 2 +- .../string.modifiers/string_insert/size_pointer_size.pass.cpp | 2 +- .../basic.string/string.modifiers/string_insert/size_size_char.pass.cpp | 2 +- .../basic.string/string.modifiers/string_insert/size_string.pass.cpp | 2 +- .../string.modifiers/string_insert/size_string_size_size.pass.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libcxx/test/strings/basic.string/string.modifiers/string_insert') diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp index 9eff67e7f01..b9e5fa8bc06 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.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_insert/iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp index 8fc469e3133..e091662eae0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp index 593279cdbf5..38353dd2f4e 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp @@ -20,7 +20,7 @@ #include #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp index e104072c73b..739c89404c1 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/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_insert/size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp index 25016ae4719..734dd8dffb7 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp index 7f360993da1..29b00ec55b9 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp index 5fad9b703d7..fd85696704c 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp index 37ac686fa07..8c18941cf46 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp index b1c4f4bc29c..b7317a32b41 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void -- cgit v1.2.3