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 --- libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp | 2 +- libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp | 2 +- libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp | 2 +- libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp | 2 +- libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp | 2 +- .../test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp | 2 +- .../test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp | 2 +- .../test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp | 2 +- .../test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp | 2 +- .../test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp | 2 +- .../test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp | 2 +- .../test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp | 2 +- libcxx/test/strings/basic.string/string.iterators/end.pass.cpp | 2 +- libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp | 2 +- libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'libcxx/test/strings/basic.string/string.iterators') diff --git a/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp index fddd6e675bb..55f2eb30f80 100644 --- a/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp index 9a9f042d428..d0c6ddbb950 100644 --- a/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp index cca6ff622d7..6b86d263245 100644 --- a/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp index dbff2a57899..6f29f433f31 100644 --- a/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp index 109c583f070..1fb422c080a 100644 --- a/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp index d9011f523cc..6cac1875ce8 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp index 3773dba3566..d90387e3a46 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp index f82349a4e1d..c4a2d0a4baf 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp index 8324c873ccc..ce44cb1ba5b 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp index fff3907ab78..8fab8babc61 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp index c36644ba2c0..d1cac07e222 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp index d2b779b47aa..914c77d48c5 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp index b3732da3e24..02180bbd73d 100644 --- a/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp index edb02d719ab..0111ad11363 100644 --- a/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp index 630565b7d77..750173dc342 100644 --- a/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "../min_allocator.h" +#include "min_allocator.h" template void -- cgit v1.2.3