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.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@195785 91177308-0d34-0410-b5e6-96231b3b80d8
2013-11-26 20:58:02 +00:00
parent bfaafd539c
commit 061d0cc4db
810 changed files with 808 additions and 1060 deletions
--- a/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>

 #include "../../input_iterator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S, class It>
 void
--- a/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
@@ -15,7 +15,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
@@ -16,7 +16,7 @@
 #include <cassert>

 #include "../../input_iterator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S, class It>
 void
--- a/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
@@ -15,7 +15,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <exception>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <exception>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
@@ -20,7 +20,7 @@
 #include <exception>
 #include <cstdlib>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
@@ -19,7 +19,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>

 #include "../../input_iterator.h"
-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S, class It>
 void
--- a/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
@@ -17,7 +17,7 @@
 #include <stdexcept>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 int main()
 {
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S, class It>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void
--- a/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
+++ b/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <cassert>

-#include "../../min_allocator.h"
+#include "min_allocator.h"

 template <class S>
 void