Found two identical files named 'DefaultOnly.h' in the libcxx test suite. Moved one to /support, removed the other, and iupdated all the includes. No functionality change

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@196118 91177308-0d34-0410-b5e6-96231b3b80d8
2013-12-02 17:00:56 +00:00 · 2013-12-02 17:00:56 +00:00 · e27dbcf2dc
commit e27dbcf2dc
parent 6daf534441
25 changed files with 23 additions and 49 deletions
--- a/test/containers/associative/map/map.modifiers/emplace.pass.cpp
+++ b/test/containers/associative/map/map.modifiers/emplace.pass.cpp
@ -19,7 +19,7 @@
 #include <tuple>

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

 int main()
--- a/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
+++ b/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

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

 int main()
--- a/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
+++ b/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

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

 int main()
--- a/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
+++ b/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

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

 int main()
--- a/test/containers/associative/multiset/emplace.pass.cpp
+++ b/test/containers/associative/multiset/emplace.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

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

 int main()
--- a/test/containers/associative/multiset/emplace_hint.pass.cpp
+++ b/test/containers/associative/multiset/emplace_hint.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

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

 int main()
--- a/test/containers/associative/set/emplace.pass.cpp
+++ b/test/containers/associative/set/emplace.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

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

 int main()
--- a/test/containers/associative/set/emplace_hint.pass.cpp
+++ b/test/containers/associative/set/emplace_hint.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

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

 int main()
--- a/test/containers/sequences/deque/deque.cons/size.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/size.pass.cpp
@ -15,7 +15,7 @@
 #include <cassert>

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

 template <class T, class Allocator>
--- a/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>

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

 int main()
 {
--- a/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
@ -15,7 +15,7 @@
 #include <forward_list>
 #include <cassert>

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

 template <class T, class Allocator>
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>

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

 int main()
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
@ -14,7 +14,7 @@
 #include <forward_list>
 #include <cassert>

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

 int main()
--- a/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
+++ b/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
+++ b/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/containers/sequences/list/list.cons/copy.pass.cpp
+++ b/test/containers/sequences/list/list.cons/copy.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
 #include "../../../test_allocator.h"
 #include "min_allocator.h"

--- a/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
+++ b/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
 #include "../../../test_allocator.h"
 #include "min_allocator.h"

--- a/test/containers/sequences/list/list.cons/default.pass.cpp
+++ b/test/containers/sequences/list/list.cons/default.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
 #include "min_allocator.h"

 int main()
--- a/test/containers/sequences/list/list.cons/size_type.pass.cpp
+++ b/test/containers/sequences/list/list.cons/size_type.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
 #include "../../../stack_allocator.h"
 #include "min_allocator.h"

--- a/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
+++ b/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
@ -13,7 +13,7 @@

 #include <list>
 #include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
 #include "../../../stack_allocator.h"
 #include "min_allocator.h"

--- a/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>

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

--- a/test/containers/DefaultOnly.h
+++ b/test/containers/DefaultOnly.h
--- a/test/utilities/tuple/tuple.tuple/DefaultOnly.h
+++ b/test/utilities/tuple/tuple.tuple/DefaultOnly.h
@ -1,26 +0,0 @@
-#ifndef DEFAULTONLY_H
-#define DEFAULTONLY_H
-
-#include <cassert>
-
-class DefaultOnly
-{
-    int data_;
-
-    DefaultOnly(const DefaultOnly&);
-    DefaultOnly& operator=(const DefaultOnly&);
-public:
-    static int count;
-
-    DefaultOnly() : data_(-1) {++count;}
-    ~DefaultOnly() {data_ = 0; --count;}
-
-    friend bool operator==(const DefaultOnly& x, const DefaultOnly& y)
-        {return x.data_ == y.data_;}
-    friend bool operator< (const DefaultOnly& x, const DefaultOnly& y)
-        {return x.data_ < y.data_;}
-};
-
-int DefaultOnly::count = 0;
-
-#endif  // DEFAULTONLY_H
--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
@ -17,7 +17,7 @@
 #include <tuple>
 #include <cassert>

-#include "../DefaultOnly.h"
+#include "DefaultOnly.h"
 #include "../allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"
--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
@ -17,7 +17,7 @@
 #include <string>
 #include <cassert>

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

 int main()
 {