summaryrefslogtreecommitdiffstats
path: root/libcxx/test/strings/basic.string/string.modifiers/string_erase
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2013-11-26 20:58:02 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-11-26 20:58:02 +0000
commite34f6f6a12ab7e203144ff04b2d1940f52e2ec9b (patch)
tree887780bdf017f8972bf1a1de936ff490dd72f58a /libcxx/test/strings/basic.string/string.modifiers/string_erase
parent2c9838f622e53df0095841634b30a5306592b434 (diff)
downloadbcm5719-llvm-e34f6f6a12ab7e203144ff04b2d1940f52e2ec9b.tar.gz
bcm5719-llvm-e34f6f6a12ab7e203144ff04b2d1940f52e2ec9b.zip
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
Diffstat (limited to 'libcxx/test/strings/basic.string/string.modifiers/string_erase')
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp2
10 files changed, 10 insertions, 10 deletions
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
index c9033dabdeb..6c2929d7f1d 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
+++ b/libcxx/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()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
index be95fe2d415..d20fcd4623b 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
+++ b/libcxx/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()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
index 1479171acdd..5015241ad63 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
+++ b/libcxx/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()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
index 13f97b45b66..6a23bf88ca5 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
+++ b/libcxx/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()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
index be3ee641b9f..a8443818aea 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
+++ b/libcxx/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()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
index c008196dcf0..0549e816b44 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
+++ b/libcxx/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()
{
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
index 60d54965332..c44db71ae3b 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
+++ b/libcxx/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
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
index b9bc6ca184b..dbe6d7ba0e7 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
+++ b/libcxx/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
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
index e84a3ba12ec..790ce40b0a0 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
+++ b/libcxx/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
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
index a1c37a90542..bc9ec1cf825 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
+++ b/libcxx/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
OpenPOWER on IntegriCloud