Author: marshall
Date: Mon Dec 2 11:00:56 2013
New Revision: 196118
URL: http://llvm.org/viewvc/llvm-project?rev=196118&view=rev
Log:
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
Added:
libcxx/trunk/test/support/DefaultOnly.h
- copied unchanged from r196102,
libcxx/trunk/test/utilities/tuple/tuple.tuple/DefaultOnly.h
Removed:
libcxx/trunk/test/containers/DefaultOnly.h
libcxx/trunk/test/utilities/tuple/tuple.tuple/DefaultOnly.h
Modified:
libcxx/trunk/test/containers/associative/map/map.modifiers/emplace.pass.cpp
libcxx/trunk/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
libcxx/trunk/test/containers/associative/multiset/emplace.pass.cpp
libcxx/trunk/test/containers/associative/multiset/emplace_hint.pass.cpp
libcxx/trunk/test/containers/associative/set/emplace.pass.cpp
libcxx/trunk/test/containers/associative/set/emplace_hint.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/size.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/copy.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/default.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/size_type.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
Removed: libcxx/trunk/test/containers/DefaultOnly.h
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/DefaultOnly.h?rev=196117&view=auto
==============================================================================
--- libcxx/trunk/test/containers/DefaultOnly.h (original)
+++ libcxx/trunk/test/containers/DefaultOnly.h (removed)
@@ -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
Modified:
libcxx/trunk/test/containers/associative/map/map.modifiers/emplace.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.modifiers/emplace.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.modifiers/emplace.pass.cpp
(original)
+++ libcxx/trunk/test/containers/associative/map/map.modifiers/emplace.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -19,7 +19,7 @@
#include <tuple>
#include "../../../Emplaceable.h"
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified:
libcxx/trunk/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
(original)
+++
libcxx/trunk/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../Emplaceable.h"
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified:
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
(original)
+++
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../Emplaceable.h"
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified:
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
(original)
+++
libcxx/trunk/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../Emplaceable.h"
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multiset/emplace.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/emplace.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/emplace.pass.cpp
(original)
+++ libcxx/trunk/test/containers/associative/multiset/emplace.pass.cpp Mon Dec
2 11:00:56 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../Emplaceable.h"
-#include "../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified:
libcxx/trunk/test/containers/associative/multiset/emplace_hint.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/emplace_hint.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/emplace_hint.pass.cpp
(original)
+++ libcxx/trunk/test/containers/associative/multiset/emplace_hint.pass.cpp Mon
Dec 2 11:00:56 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../Emplaceable.h"
-#include "../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/set/emplace.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/emplace.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/emplace.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/emplace.pass.cpp Mon Dec 2
11:00:56 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../Emplaceable.h"
-#include "../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/set/emplace_hint.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/emplace_hint.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/emplace_hint.pass.cpp
(original)
+++ libcxx/trunk/test/containers/associative/set/emplace_hint.pass.cpp Mon Dec
2 11:00:56 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../Emplaceable.h"
-#include "../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/size.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/size.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/size.pass.cpp
(original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/size.pass.cpp Mon
Dec 2 11:00:56 2013
@@ -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>
Modified:
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
(original)
+++
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
Mon Dec 2 11:00:56 2013
@@ -14,7 +14,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
int main()
{
Modified:
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
(original)
+++
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -15,7 +15,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
template <class T, class Allocator>
Modified:
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
(original)
+++
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -14,7 +14,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified:
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
(original)
+++
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -14,7 +14,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified:
libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
(original)
+++
libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -13,7 +13,7 @@
#include <list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified:
libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
(original)
+++
libcxx/trunk/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -13,7 +13,7 @@
#include <list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/copy.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/copy.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/copy.pass.cpp
(original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/copy.pass.cpp Mon Dec
2 11:00:56 2013
@@ -13,7 +13,7 @@
#include <list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "../../../test_allocator.h"
#include "min_allocator.h"
Modified:
libcxx/trunk/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
(original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -13,7 +13,7 @@
#include <list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "../../../test_allocator.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/default.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/default.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/default.pass.cpp
(original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/default.pass.cpp Mon
Dec 2 11:00:56 2013
@@ -13,7 +13,7 @@
#include <list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
int main()
Modified:
libcxx/trunk/test/containers/sequences/list/list.cons/size_type.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/size_type.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/size_type.pass.cpp
(original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/size_type.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -13,7 +13,7 @@
#include <list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "../../../stack_allocator.h"
#include "min_allocator.h"
Modified:
libcxx/trunk/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
(original)
+++
libcxx/trunk/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -13,7 +13,7 @@
#include <list>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "../../../stack_allocator.h"
#include "min_allocator.h"
Modified:
libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
---
libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
(original)
+++
libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../../DefaultOnly.h"
+#include "DefaultOnly.h"
#include "min_allocator.h"
#include "../../../test_allocator.h"
Removed: libcxx/trunk/test/utilities/tuple/tuple.tuple/DefaultOnly.h
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/DefaultOnly.h?rev=196117&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/DefaultOnly.h (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/DefaultOnly.h (removed)
@@ -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
Modified:
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
(original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -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"
Modified:
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp?rev=196118&r1=196117&r2=196118&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
(original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
Mon Dec 2 11:00:56 2013
@@ -17,7 +17,7 @@
#include <string>
#include <cassert>
-#include "../DefaultOnly.h"
+#include "DefaultOnly.h"
int main()
{
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
