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

30 files changed, 30 insertions, 30 deletions

diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
index 2a3b03df6f7..4a912eaec6f 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
index a1ca8ce6ee7..6596f2fffa7 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
index 47e66efd8b9..84f52bb2e50 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
index 0565b37e732..a3c9911abe9 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
index 689fb7281e0..af806bc0457 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
index 5f777ba1c56..102e8ea0815 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int main()
 {
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
index 264494cb719..cee538800dd 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class S>
 void
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
index 6810c4f7600..cc08982a5ca 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_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.nonmembers/string_op!=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
index e47214e6c08..b496d70dc2f 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.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.nonmembers/string_op!=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
index 864da89d103..069b305111d 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
@@ -16,7 +16,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.nonmembers/string_op+/char_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
index 2d095a2b51f..4e09bf2464c 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
@@ -20,7 +20,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.nonmembers/string_op+/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
index a06157de8aa..9dc8a510beb 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
@@ -20,7 +20,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.nonmembers/string_op+/string_char.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
index fa5d0becf3f..4d72db595b1 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
@@ -20,7 +20,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.nonmembers/string_op+/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
index 0be44c752e2..47fc1ca51b8 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
@@ -20,7 +20,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.nonmembers/string_op+/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
index 4a9fabe381a..bf2ddd51f72 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
@@ -32,7 +32,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.nonmembers/string_operator==/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
index a64881cf502..19a5bdd977e 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_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.nonmembers/string_operator==/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
index 77ebe081d38..22006bb1be6 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.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.nonmembers/string_operator==/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
index 5946839b929..0bff70a977a 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
@@ -16,7 +16,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.nonmembers/string_opgt/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
index 56af158ed96..f9fa204b9ee 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_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.nonmembers/string_opgt/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
index 0577ed0e594..daa6f40ae3c 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.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.nonmembers/string_opgt/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
index 3074bc93e71..95073bf7644 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
@@ -16,7 +16,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.nonmembers/string_opgt=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
index 2105af0472c..eab117a843f 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_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.nonmembers/string_opgt=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
index 69359f765c3..56b3b35b3d9 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.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.nonmembers/string_opgt=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
index 32c340685bc..c02b202c49e 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
@@ -16,7 +16,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.nonmembers/string_oplt/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
index 28e8db934fd..86f6a2db119 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_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.nonmembers/string_oplt/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
index 66063bb25cc..b935da5426f 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.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.nonmembers/string_oplt/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
index 3c5d115543d..487e2056f2c 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
@@ -16,7 +16,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.nonmembers/string_oplt=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
index 05ab3196b02..21959405194 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_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.nonmembers/string_oplt=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
index 964d71c54be..bb1bce8d404 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.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.nonmembers/string_oplt=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
index 5758ae3c01f..2b975f160d5 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
@@ -16,7 +16,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class S>
 void