summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/containers/associative/set/set.cons
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-01-28 21:22:53 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-01-28 21:22:53 +0000
commit949389c395edffc54f3551cbb595065a6f4e6a78 (patch)
tree98d3a7954200b180b9a0b8516309184e056a5598 /libcxx/test/std/containers/associative/set/set.cons
parent7f3639fb194c132a7474132489973aeb27584a7c (diff)
downloadbcm5719-llvm-949389c395edffc54f3551cbb595065a6f4e6a78.tar.gz
bcm5719-llvm-949389c395edffc54f3551cbb595065a6f4e6a78.zip
We had two identical files named 'MoveOnly.h' in the test suite. Move one to support/, remove the other, and update all the tests that included them. No functionality change.
llvm-svn: 227370
Diffstat (limited to 'libcxx/test/std/containers/associative/set/set.cons')
-rw-r--r--libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
index 4d5754a9e6b..2156169acbc 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
@@ -20,7 +20,7 @@
#include <set>
#include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
#include "test_allocator.h"
template <class T>
diff --git a/libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
index 25f5425c75a..b554d828d48 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
@@ -14,7 +14,7 @@
#include <set>
#include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp
index bad5e8f8c9e..799f0e402d6 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp
@@ -16,7 +16,7 @@
#include <set>
#include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "Counter.h"
diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
index 4e08f014ebe..ed0e77ae179 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
@@ -16,7 +16,7 @@
#include <set>
#include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
index 17ea74036db..3999c55e9e7 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
@@ -20,7 +20,7 @@
#include <set>
#include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
#include "test_allocator.h"
template <class T>
diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
index 7a8ae7bf2b5..5ccfed4675c 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
@@ -18,7 +18,7 @@
#include <set>
#include <cassert>
-#include "../../../MoveOnly.h"
+#include "MoveOnly.h"
#include "test_allocator.h"
template <class T>
OpenPOWER on IntegriCloud