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

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@196127 91177308-0d34-0410-b5e6-96231b3b80d8
2013-12-02 18:08:31 +00:00 · 2013-12-02 18:08:31 +00:00 · ebedffde9a
commit ebedffde9a
parent e27dbcf2dc
30 changed files with 28 additions and 202 deletions
--- a/test/utilities/allocator.adaptor/allocators.h
+++ b/test/utilities/allocator.adaptor/allocators.h
--- a/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
@ -19,7 +19,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
@ -19,7 +19,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
@ -19,7 +19,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>
 #include <string>

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

 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES

--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>
 #include <string>

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

 struct B
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
@ -18,7 +18,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
@ -18,7 +18,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <type_traits>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <type_traits>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <type_traits>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
+++ b/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
@ -17,7 +17,7 @@
 #include <scoped_allocator>
 #include <type_traits>

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

 int main()
 {
--- a/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
+++ b/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
@ -25,7 +25,7 @@
 #include <scoped_allocator>
 #include <cassert>

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

 int main()
 {
--- a/test/utilities/tuple/tuple.tuple/allocators.h
+++ b/test/utilities/tuple/tuple.tuple/allocators.h
@ -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
--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

 #include "DefaultOnly.h"
-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"

--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

 #include "../MoveOnly.h"
-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"

--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
@ -17,7 +17,7 @@
 #include <tuple>
 #include <cassert>

-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"

--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
@ -18,7 +18,7 @@
 #include <utility>
 #include <cassert>

-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"

--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
@ -17,7 +17,7 @@
 #include <tuple>
 #include <cassert>

-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"

--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
@ -19,7 +19,7 @@
 #include <memory>
 #include <cassert>

-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"

--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
@ -17,7 +17,7 @@
 #include <tuple>
 #include <cassert>

-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"

--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
@ -18,7 +18,7 @@
 #include <cassert>

 #include "../MoveOnly.h"
-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"

--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
+++ b/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
@ -19,7 +19,7 @@
 #include <memory>
 #include <cassert>

-#include "../allocators.h"
+#include "allocators.h"
 #include "../alloc_first.h"
 #include "../alloc_last.h"