[libcxx] r196127 - Found two identical files named 'allocators.h' in the libcxx test suite. Moved one to /support, removed the other, and iupdated all the includes. No functionality change
Marshall Clow
mclow.lists at gmail.com
Mon Dec 2 10:08:32 PST 2013
Author: marshall
Date: Mon Dec 2 12:08:31 2013
New Revision: 196127
URL: http://llvm.org/viewvc/llvm-project?rev=196127&view=rev
Log:
Found two identical files named 'allocators.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/allocators.h
- copied unchanged from r196102, libcxx/trunk/test/utilities/allocator.adaptor/allocators.h
Removed:
libcxx/trunk/test/utilities/allocator.adaptor/allocators.h
libcxx/trunk/test/utilities/tuple/tuple.tuple/allocators.h
Modified:
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
libcxx/trunk/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp Mon Dec 2 12:08:31 2013
@@ -19,7 +19,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp Mon Dec 2 12:08:31 2013
@@ -19,7 +19,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp Mon Dec 2 12:08:31 2013
@@ -19,7 +19,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp Mon Dec 2 12:08:31 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include <string>
-#include "../allocators.h"
+#include "allocators.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp Mon Dec 2 12:08:31 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include <string>
-#include "../allocators.h"
+#include "allocators.h"
struct B
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp Mon Dec 2 12:08:31 2013
@@ -18,7 +18,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp Mon Dec 2 12:08:31 2013
@@ -18,7 +18,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <type_traits>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <type_traits>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <type_traits>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Modified: libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <scoped_allocator>
#include <type_traits>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Removed: libcxx/trunk/test/utilities/allocator.adaptor/allocators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/allocators.h?rev=196126&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/allocators.h (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/allocators.h (removed)
@@ -1,174 +0,0 @@
-#ifndef ALLOCATORS_H
-#define ALLOCATORS_H
-
-#include <type_traits>
-#include <utility>
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class T>
-class A1
-{
- int id_;
-public:
- explicit A1(int id = 0) : id_(id) {}
-
- typedef T value_type;
-
- int id() const {return id_;}
-
- static bool copy_called;
- static bool move_called;
- static bool allocate_called;
- static std::pair<T*, std::size_t> deallocate_called;
-
- A1(const A1& a) : id_(a.id()) {copy_called = true;}
- A1(A1&& a) : id_(a.id()) {move_called = true;}
-
- template <class U>
- A1(const A1<U>& a) : id_(a.id()) {copy_called = true;}
- template <class U>
- A1(A1<U>&& a) : id_(a.id()) {move_called = true;}
-
- T* allocate(std::size_t n)
- {
- allocate_called = true;
- return (T*)n;
- }
-
- void deallocate(T* p, std::size_t n)
- {
- deallocate_called = std::pair<T*, std::size_t>(p, n);
- }
-
- std::size_t max_size() const {return id_;}
-};
-
-template <class T> bool A1<T>::copy_called = false;
-template <class T> bool A1<T>::move_called = false;
-template <class T> bool A1<T>::allocate_called = false;
-template <class T> std::pair<T*, std::size_t> A1<T>::deallocate_called;
-
-template <class T, class U>
-inline
-bool operator==(const A1<T>& x, const A1<U>& y)
-{
- return x.id() == y.id();
-}
-
-template <class T, class U>
-inline
-bool operator!=(const A1<T>& x, const A1<U>& y)
-{
- return !(x == y);
-}
-
-template <class T>
-class A2
-{
- int id_;
-public:
- explicit A2(int id = 0) : id_(id) {}
-
- typedef T value_type;
-
- typedef unsigned size_type;
- typedef int difference_type;
-
- typedef std::true_type propagate_on_container_move_assignment;
-
- int id() const {return id_;}
-
- static bool copy_called;
- static bool move_called;
- static bool allocate_called;
-
- A2(const A2& a) : id_(a.id()) {copy_called = true;}
- A2(A2&& a) : id_(a.id()) {move_called = true;}
-
- T* allocate(std::size_t n, const void* hint)
- {
- allocate_called = true;
- return (T*)hint;
- }
-};
-
-template <class T> bool A2<T>::copy_called = false;
-template <class T> bool A2<T>::move_called = false;
-template <class T> bool A2<T>::allocate_called = false;
-
-template <class T, class U>
-inline
-bool operator==(const A2<T>& x, const A2<U>& y)
-{
- return x.id() == y.id();
-}
-
-template <class T, class U>
-inline
-bool operator!=(const A2<T>& x, const A2<U>& y)
-{
- return !(x == y);
-}
-
-template <class T>
-class A3
-{
- int id_;
-public:
- explicit A3(int id = 0) : id_(id) {}
-
- typedef T value_type;
-
- typedef std::true_type propagate_on_container_copy_assignment;
- typedef std::true_type propagate_on_container_swap;
-
- int id() const {return id_;}
-
- static bool copy_called;
- static bool move_called;
- static bool constructed;
- static bool destroy_called;
-
- A3(const A3& a) : id_(a.id()) {copy_called = true;}
- A3(A3&& a) : id_(a.id()) {move_called = true;}
-
- template <class U, class ...Args>
- void construct(U* p, Args&& ...args)
- {
- ::new (p) U(std::forward<Args>(args)...);
- constructed = true;
- }
-
- template <class U>
- void destroy(U* p)
- {
- p->~U();
- destroy_called = true;
- }
-
- A3 select_on_container_copy_construction() const {return A3(-1);}
-};
-
-template <class T> bool A3<T>::copy_called = false;
-template <class T> bool A3<T>::move_called = false;
-template <class T> bool A3<T>::constructed = false;
-template <class T> bool A3<T>::destroy_called = false;
-
-template <class T, class U>
-inline
-bool operator==(const A3<T>& x, const A3<U>& y)
-{
- return x.id() == y.id();
-}
-
-template <class T, class U>
-inline
-bool operator!=(const A3<T>& x, const A3<U>& y)
-{
- return !(x == y);
-}
-
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#endif // ALLOCATORS_H
Modified: libcxx/trunk/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp (original)
+++ libcxx/trunk/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp Mon Dec 2 12:08:31 2013
@@ -25,7 +25,7 @@
#include <scoped_allocator>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
int main()
{
Removed: libcxx/trunk/test/utilities/tuple/tuple.tuple/allocators.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/allocators.h?rev=196126&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/allocators.h (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/allocators.h (removed)
@@ -1,174 +0,0 @@
-#ifndef ALLOCATORS_H
-#define ALLOCATORS_H
-
-#include <type_traits>
-#include <utility>
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class T>
-class A1
-{
- int id_;
-public:
- explicit A1(int id = 0) : id_(id) {}
-
- typedef T value_type;
-
- int id() const {return id_;}
-
- static bool copy_called;
- static bool move_called;
- static bool allocate_called;
- static std::pair<T*, std::size_t> deallocate_called;
-
- A1(const A1& a) : id_(a.id()) {copy_called = true;}
- A1(A1&& a) : id_(a.id()) {move_called = true;}
-
- template <class U>
- A1(const A1<U>& a) : id_(a.id()) {copy_called = true;}
- template <class U>
- A1(A1<U>&& a) : id_(a.id()) {move_called = true;}
-
- T* allocate(std::size_t n)
- {
- allocate_called = true;
- return (T*)n;
- }
-
- void deallocate(T* p, std::size_t n)
- {
- deallocate_called = std::pair<T*, std::size_t>(p, n);
- }
-
- std::size_t max_size() const {return id_;}
-};
-
-template <class T> bool A1<T>::copy_called = false;
-template <class T> bool A1<T>::move_called = false;
-template <class T> bool A1<T>::allocate_called = false;
-template <class T> std::pair<T*, std::size_t> A1<T>::deallocate_called;
-
-template <class T, class U>
-inline
-bool operator==(const A1<T>& x, const A1<U>& y)
-{
- return x.id() == y.id();
-}
-
-template <class T, class U>
-inline
-bool operator!=(const A1<T>& x, const A1<U>& y)
-{
- return !(x == y);
-}
-
-template <class T>
-class A2
-{
- int id_;
-public:
- explicit A2(int id = 0) : id_(id) {}
-
- typedef T value_type;
-
- typedef unsigned size_type;
- typedef int difference_type;
-
- typedef std::true_type propagate_on_container_move_assignment;
-
- int id() const {return id_;}
-
- static bool copy_called;
- static bool move_called;
- static bool allocate_called;
-
- A2(const A2& a) : id_(a.id()) {copy_called = true;}
- A2(A2&& a) : id_(a.id()) {move_called = true;}
-
- T* allocate(std::size_t n, const void* hint)
- {
- allocate_called = true;
- return (T*)hint;
- }
-};
-
-template <class T> bool A2<T>::copy_called = false;
-template <class T> bool A2<T>::move_called = false;
-template <class T> bool A2<T>::allocate_called = false;
-
-template <class T, class U>
-inline
-bool operator==(const A2<T>& x, const A2<U>& y)
-{
- return x.id() == y.id();
-}
-
-template <class T, class U>
-inline
-bool operator!=(const A2<T>& x, const A2<U>& y)
-{
- return !(x == y);
-}
-
-template <class T>
-class A3
-{
- int id_;
-public:
- explicit A3(int id = 0) : id_(id) {}
-
- typedef T value_type;
-
- typedef std::true_type propagate_on_container_copy_assignment;
- typedef std::true_type propagate_on_container_swap;
-
- int id() const {return id_;}
-
- static bool copy_called;
- static bool move_called;
- static bool constructed;
- static bool destroy_called;
-
- A3(const A3& a) : id_(a.id()) {copy_called = true;}
- A3(A3&& a) : id_(a.id()) {move_called = true;}
-
- template <class U, class ...Args>
- void construct(U* p, Args&& ...args)
- {
- ::new (p) U(std::forward<Args>(args)...);
- constructed = true;
- }
-
- template <class U>
- void destroy(U* p)
- {
- p->~U();
- destroy_called = true;
- }
-
- A3 select_on_container_copy_construction() const {return A3(-1);}
-};
-
-template <class T> bool A3<T>::copy_called = false;
-template <class T> bool A3<T>::move_called = false;
-template <class T> bool A3<T>::constructed = false;
-template <class T> bool A3<T>::destroy_called = false;
-
-template <class T, class U>
-inline
-bool operator==(const A3<T>& x, const A3<U>& y)
-{
- return x.id() == y.id();
-}
-
-template <class T, class U>
-inline
-bool operator!=(const A3<T>& x, const A3<U>& y)
-{
- return !(x == y);
-}
-
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#endif // ALLOCATORS_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=196127&r1=196126&r2=196127&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 12:08:31 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "DefaultOnly.h"
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
Modified: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp Mon Dec 2 12:08:31 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../MoveOnly.h"
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
Modified: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <tuple>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
Modified: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp Mon Dec 2 12:08:31 2013
@@ -18,7 +18,7 @@
#include <utility>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
Modified: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <tuple>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
Modified: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp Mon Dec 2 12:08:31 2013
@@ -19,7 +19,7 @@
#include <memory>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
Modified: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp Mon Dec 2 12:08:31 2013
@@ -17,7 +17,7 @@
#include <tuple>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
Modified: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp Mon Dec 2 12:08:31 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../MoveOnly.h"
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
Modified: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp?rev=196127&r1=196126&r2=196127&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp (original)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp Mon Dec 2 12:08:31 2013
@@ -19,7 +19,7 @@
#include <memory>
#include <cassert>
-#include "../allocators.h"
+#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
More information about the cfe-commits
mailing list