diff options
Diffstat (limited to 'libcxx')
25 files changed, 23 insertions, 49 deletions
diff --git a/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp index 5ac44286376..81846c6647c 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp index 7ce8c19805f..15f74b17e78 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp index 6fbcda922df..03da4af5937 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp index 7d5e5e89d15..846d5999a17 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/associative/multiset/emplace.pass.cpp b/libcxx/test/containers/associative/multiset/emplace.pass.cpp index 6b76cf05e03..450ee6cd35a 100644 --- a/libcxx/test/containers/associative/multiset/emplace.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp b/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp index 1eddd1e920d..194adf761c4 100644 --- a/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/associative/set/emplace.pass.cpp b/libcxx/test/containers/associative/set/emplace.pass.cpp index 731382f8d2c..5ebab4d24b9 100644 --- a/libcxx/test/containers/associative/set/emplace.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/associative/set/emplace_hint.pass.cpp b/libcxx/test/containers/associative/set/emplace_hint.pass.cpp index f06cfeceaf2..5fdeb4ffef3 100644 --- a/libcxx/test/containers/associative/set/emplace_hint.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp index 8ce1ab2fd9f..d2e324b0e3f 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp +++ b/libcxx/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> diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp index b80b947d61e..2d963a1be47 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp +++ b/libcxx/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() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp index 1bebcd4dec0..e02dcb4bf69 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp +++ b/libcxx/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> diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp index 20861368b43..ef7ef82626d 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp index d722b925e19..d4bd6b4e011 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp b/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp index 7f0ebc980b4..14629b173a6 100644 --- a/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp index ab171d5cc7e..2738ffbbefd 100644 --- a/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp index 0d093bd2a55..41e72f79de7 100644 --- a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp +++ b/libcxx/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" diff --git a/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp index 910021c6853..f11e870805b 100644 --- a/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp +++ b/libcxx/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" diff --git a/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp index e992dca9c7f..6962d28a596 100644 --- a/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp +++ b/libcxx/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() diff --git a/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp index b72c9ca70e1..75b93a3dfb6 100644 --- a/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp +++ b/libcxx/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" diff --git a/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp index e1d768e4446..12da86da0a4 100644 --- a/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp +++ b/libcxx/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" diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp index 800c732194b..0cff78dd04f 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp +++ b/libcxx/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" diff --git a/libcxx/test/containers/DefaultOnly.h b/libcxx/test/support/DefaultOnly.h index bdcf46d19ff..bdcf46d19ff 100644 --- a/libcxx/test/containers/DefaultOnly.h +++ b/libcxx/test/support/DefaultOnly.h diff --git a/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h b/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h deleted file mode 100644 index bdcf46d19ff..00000000000 --- a/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h +++ /dev/null @@ -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 diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp index d25bdf9f754..cfbdaedfc5a 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp +++ b/libcxx/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" diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp index 84ecd8d2cd1..b72b77ee97c 100644 --- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp +++ b/libcxx/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() { |
