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

34 files changed, 34 insertions, 34 deletions

diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
index 3326b35a0577..3bdb800bf736 100644
--- a/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.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.ops/string.accessors/data.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp
index c2c57f6f13d0..917248fa6916 100644
--- a/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/data.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.ops/string.accessors/get_allocator.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
index 8d998171c64a..b3892d72de57 100644
--- a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../test_allocator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class S>
 void
diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
index c13905e206f8..dda7428992a1 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int sign(int x)
 {
diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
index ca4b067a1ce5..9ed58a3e9bbc 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
@@ -15,7 +15,7 @@
 #include <stdexcept>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int sign(int x)
 {
diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
index c94eaef37dbe..ee804d9cc6e5 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
@@ -15,7 +15,7 @@
 #include <stdexcept>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int sign(int x)
 {
diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
index 4312e276541f..3deb617e8d84 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
@@ -15,7 +15,7 @@
 #include <stdexcept>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int sign(int x)
 {
diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
index 8fa23b7ec257..29eba9a97675 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int sign(int x)
 {
diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
index 58f576084c36..7de95a8cda56 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 int sign(int x)
 {
diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
index 302f725dced2..590173eddf41 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.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.ops/string_find.first.not.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
index 66b21aea39dd..53d3a95292c2 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.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.ops/string_find.first.not.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
index 4416b8264204..14ac4b2a153b 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.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.ops/string_find.first.not.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
index 3d28c2479bee..4fb072fa4744 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.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.ops/string_find.first.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
index fd64fdf7802e..32d0e86f3d84 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.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.ops/string_find.first.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
index 59e00de36aaf..6dd176df0165 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.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.ops/string_find.first.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
index 0c21a02fb5a8..9e98a6ad20f7 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.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.ops/string_find.first.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
index d7db16f6e356..e409edc25f48 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.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.ops/string_find.last.not.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
index f6ce46acf56d..b130f9287ba3 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.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.ops/string_find.last.not.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
index 47c6d7ffd9b4..3e6bd9d093ea 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.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.ops/string_find.last.not.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
index f131b962217f..4db7762b2755 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.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.ops/string_find.last.not.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
index 6de632670c36..ba93adbe445e 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.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.ops/string_find.last.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
index 32aa77d5083d..12765b71f28f 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.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.ops/string_find.last.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
index cfe71d2e787b..f1b447c43f4b 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.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.ops/string_find.last.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
index 7d82dc0fe22e..7f96e6351aa6 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.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.ops/string_find.last.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
index 98f78f80738b..351c6727de2d 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.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.ops/string_find/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
index 3c48a77045d7..24e58fc5f1ad 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find/char_size.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.ops/string_find/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
index c3ea07976bf9..e00d7fd8a3dc 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.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.ops/string_find/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
index f936651eb203..3006c466eed3 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.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.ops/string_find/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
index dc280d0aca29..a89df4e3ffa1 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_find/string_size.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.ops/string_rfind/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
index 8db67d9fa955..cbc0c9b35367 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.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.ops/string_rfind/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
index 2b1efd336dc0..450aebedd59c 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.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.ops/string_rfind/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
index 5699cabfbebd..47baf40b265b 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.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.ops/string_rfind/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
index d7c2e8503a6f..05e6e5174232 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.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.ops/string_substr/substr.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
index 9612b5838995..a73f70cd4b89 100644
--- a/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../../min_allocator.h"
+#include "min_allocator.h"
 
 template <class S>
 void