[libcxx] r196174 - Found six (nmostly) identical files named 'test_allocator.h' in the libcxx test suite. Moved one to /support, made it a superset, and removed all but one of the others, and iupdated all the includes. Left the odd one (thread/futures/test_allocator.h) for later.
Marshall Clow
mclow.lists at gmail.com
Mon Dec 2 16:18:13 PST 2013
Author: marshall
Date: Mon Dec 2 18:18:10 2013
New Revision: 196174
URL: http://llvm.org/viewvc/llvm-project?rev=196174&view=rev
Log:
Found six (nmostly) identical files named 'test_allocator.h' in the libcxx test suite. Moved one to /support, made it a superset, and removed all but one of the others, and iupdated all the includes. Left the odd one (thread/futures/test_allocator.h) for later.
Added:
libcxx/trunk/test/support/test_allocator.h
Removed:
libcxx/trunk/test/containers/test_allocator.h
libcxx/trunk/test/re/test_allocator.h
libcxx/trunk/test/strings/basic.string/test_allocator.h
libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
Modified:
libcxx/trunk/test/containers/associative/map/map.cons/alloc.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/copy.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/copy_assign.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/move.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/move_alloc.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/move_assign.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/map/map.special/non_member_swap.pass.cpp
libcxx/trunk/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/move.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
libcxx/trunk/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/move.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
libcxx/trunk/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/alloc.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/copy.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/copy_assign.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/move.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/move_alloc.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/move_assign.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
libcxx/trunk/test/containers/associative/set/set.special/non_member_swap.pass.cpp
libcxx/trunk/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/copy.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/move.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.special/swap.pass.cpp
libcxx/trunk/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/deque/types.pass.cpp
libcxx/trunk/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
libcxx/trunk/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/assign_move.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_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.special/swap.pass.cpp
libcxx/trunk/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/assign_copy.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/assign_move.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/construct_default.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/construct_size.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/copy.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/move.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/move_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/swap.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector.bool/types.pass.cpp
libcxx/trunk/test/containers/sequences/vector/types.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/copy.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/move.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.special/swap.pass.cpp
libcxx/trunk/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/swap_member.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/swap_member.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/swap_member.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/swap_member.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
libcxx/trunk/test/re/re.results/re.results.all/get_allocator.pass.cpp
libcxx/trunk/test/re/re.results/re.results.const/allocator.pass.cpp
libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp
libcxx/trunk/test/re/re.results/re.results.form/form3.pass.cpp
libcxx/trunk/test/strings/basic.string/string.capacity/capacity.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/alloc.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/copy.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/initializer_list.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/move.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/move_alloc.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/move_assignment.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
libcxx/trunk/test/strings/basic.string/string.cons/substr.pass.cpp
libcxx/trunk/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
libcxx/trunk/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
Modified: libcxx/trunk/test/containers/associative/map/map.cons/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <map>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/compare_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/compare_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/compare_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/copy_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/copy_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/copy_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/copy_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <map>
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/move_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/move_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/move_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/move_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/map/map.special/non_member_swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.special/non_member_swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.special/non_member_swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.special/non_member_swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <map>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_compare.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/map/map.special/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/map/map.special/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/map/map.special/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <map>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <map>
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <map>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_compare.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <set>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <set>
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <set>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_compare.h"
int main()
Modified: libcxx/trunk/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/set/set.cons/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <set>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/compare_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/compare_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/compare_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/copy_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/copy_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/copy_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/copy_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <set>
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/set/set.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/associative/set/set.cons/move_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/move_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/move_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/move_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/associative/set/set.special/non_member_swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.special/non_member_swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.special/non_member_swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.special/non_member_swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <set>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_compare.h"
int main()
Modified: libcxx/trunk/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/associative/set/set.special/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/associative/set/set.special/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/associative/set/set.special/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct test
Modified: libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct test
Modified: libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
Modified: libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
Modified: libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -25,7 +25,7 @@ make(int n)
return c;
}
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct test
Modified: libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -29,7 +29,7 @@ make(int n)
return c;
}
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct test
Modified: libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
struct test
: private std::queue<int, std::deque<int, test_allocator<int> > >
Modified: libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
Modified: libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
Modified: libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
Modified: libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <queue>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
Modified: libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
struct test
: private std::stack<int, std::deque<int, test_allocator<int> > >
Modified: libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
Modified: libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
C
Modified: libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
Modified: libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <stack>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <deque>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../NotConstructible.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <deque>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <deque>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <deque>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <cassert>
#include "test_iterators.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class InputIterator, class Allocator>
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <deque>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/deque/deque.special/swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.special/swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.special/swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.special/swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <deque>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/deque/types.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/deque/types.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/deque/types.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/deque/types.pass.cpp Mon Dec 2 18:18:10 2013
@@ -33,7 +33,7 @@
#include <iterator>
#include <type_traits>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "../../Copyable.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -31,7 +31,7 @@
#include <algorithm>
#include <complex>
#include <string>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
using std::experimental::dynarray;
Modified: libcxx/trunk/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#if _LIBCPP_STD_VER > 11
#include <experimental/dynarray>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
using std::experimental::dynarray;
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../NotConstructible.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../NotConstructible.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include <iterator>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include <iterator>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include <iterator>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include <iterator>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include <iterator>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include <iterator>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../MoveOnly.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <cassert>
#include <iterator>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "test_iterators.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <forward_list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/assign_copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/assign_copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/assign_copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/assign_move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/assign_move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <list>
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.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=196174&r1=196173&r2=196174&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 18:18:10 2013
@@ -14,7 +14,7 @@
#include <list>
#include <cassert>
#include "DefaultOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
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=196174&r1=196173&r2=196174&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 18:18:10 2013
@@ -14,7 +14,7 @@
#include <list>
#include <cassert>
#include "DefaultOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <list>
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <list>
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/list/list.special/swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.special/swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.special/swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.special/swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <list>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/vector.bool/assign_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/assign_copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/assign_copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/assign_copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector.bool/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/assign_move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/assign_move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector.bool/construct_default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/construct_default.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/construct_default.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/construct_default.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/vector.bool/construct_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/construct_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/construct_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/construct_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <cassert>
#include "min_allocator.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
void
Modified: libcxx/trunk/test/containers/sequences/vector.bool/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector.bool/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector.bool/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/vector.bool/swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <vector>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/vector.bool/types.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector.bool/types.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector.bool/types.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector.bool/types.pass.cpp Mon Dec 2 18:18:10 2013
@@ -31,7 +31,7 @@
#include <iterator>
#include <type_traits>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "../../Copyable.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/vector/types.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/types.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/types.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/types.pass.cpp Mon Dec 2 18:18:10 2013
@@ -33,7 +33,7 @@
#include <iterator>
#include <type_traits>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "../../Copyable.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <vector>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../NotConstructible.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=196174&r1=196173&r2=196174&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 18:18:10 2013
@@ -16,7 +16,7 @@
#include "DefaultOnly.h"
#include "min_allocator.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class C>
void
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <vector>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -13,7 +13,7 @@
#include <vector>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class C>
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/containers/sequences/vector/vector.special/swap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.special/swap.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.special/swap.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.special/swap.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <vector>
#include <cassert>
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Removed: libcxx/trunk/test/containers/test_allocator.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/test_allocator.h?rev=196173&view=auto
==============================================================================
--- libcxx/trunk/test/containers/test_allocator.h (original)
+++ libcxx/trunk/test/containers/test_allocator.h (removed)
@@ -1,117 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
- static int count;
-public:
- static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(-1) {}
- explicit test_allocator(int i) throw() : data_(i) {}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {}
- ~test_allocator() throw() {data_ = 0;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void construct(pointer p, T&& val)
- {::new(p) T(std::move(val));}
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
- int data_;
-
- template <class U> friend class other_allocator;
-
-public:
- typedef T value_type;
-
- other_allocator() : data_(-1) {}
- explicit other_allocator(int i) : data_(i) {}
- template <class U> other_allocator(const other_allocator<U>& a)
- : data_(a.data_) {}
- T* allocate(std::size_t n)
- {return (T*)std::malloc(n * sizeof(T));}
- void deallocate(T* p, std::size_t n)
- {std::free(p);}
-
- other_allocator select_on_container_copy_construction() const
- {return other_allocator(-2);}
-
- friend bool operator==(const other_allocator& x, const other_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const other_allocator& x, const other_allocator& y)
- {return !(x == y);}
-
- typedef std::true_type propagate_on_container_copy_assignment;
- typedef std::true_type propagate_on_container_move_assignment;
- typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
- std::size_t max_size() const
- {return UINT_MAX / sizeof(T);}
-#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif // TEST_ALLOCATOR_H
Modified: libcxx/trunk/test/containers/unord/unord.map/swap_member.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/swap_member.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/swap_member.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/swap_member.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../test_compare.h"
#include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_hash.h"
template <class T>
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -23,7 +23,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -23,7 +23,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp Mon Dec 2 18:18:10 2013
@@ -25,7 +25,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -25,7 +25,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -26,7 +26,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -26,7 +26,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -27,7 +27,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/swap_member.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/swap_member.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/swap_member.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/swap_member.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../test_compare.h"
#include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_hash.h"
template <class T>
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -23,7 +23,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -23,7 +23,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -24,7 +24,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp Mon Dec 2 18:18:10 2013
@@ -25,7 +25,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -25,7 +25,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -26,7 +26,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -26,7 +26,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -27,7 +27,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/swap_member.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/swap_member.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/swap_member.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/swap_member.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include "../../test_compare.h"
#include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_hash.h"
template <class T>
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp Mon Dec 2 18:18:10 2013
@@ -23,7 +23,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -23,7 +23,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -25,7 +25,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/swap_member.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/swap_member.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/swap_member.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/swap_member.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include "../../test_compare.h"
#include "../../test_hash.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "../../../test_hash.h"
template <class T>
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -15,7 +15,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp Mon Dec 2 18:18:10 2013
@@ -23,7 +23,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -23,7 +23,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -24,7 +24,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -25,7 +25,7 @@
#include "test_iterators.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include "../../../NotConstructible.h"
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <cassert>
#include "../../../MoveOnly.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_comp
Modified: libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp (original)
+++ libcxx/trunk/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp Mon Dec 2 18:18:10 2013
@@ -20,7 +20,7 @@
#include "../../../test_compare.h"
#include "../../../test_hash.h"
-#include "../../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/re/re.results/re.results.all/get_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.results/re.results.all/get_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.results/re.results.all/get_allocator.pass.cpp (original)
+++ libcxx/trunk/test/re/re.results/re.results.all/get_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <regex>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class CharT, class Allocator>
void
Modified: libcxx/trunk/test/re/re.results/re.results.const/allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.results/re.results.const/allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.results/re.results.const/allocator.pass.cpp (original)
+++ libcxx/trunk/test/re/re.results/re.results.const/allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <regex>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class CharT, class Allocator>
void
Modified: libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp (original)
+++ libcxx/trunk/test/re/re.results/re.results.form/form2.pass.cpp Mon Dec 2 18:18:10 2013
@@ -22,7 +22,7 @@
#include <cassert>
#include "test_iterators.h"
-#include "../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/re/re.results/re.results.form/form3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.results/re.results.form/form3.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.results/re.results.form/form3.pass.cpp (original)
+++ libcxx/trunk/test/re/re.results/re.results.form/form3.pass.cpp Mon Dec 2 18:18:10 2013
@@ -21,7 +21,7 @@
#include <regex>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Removed: libcxx/trunk/test/re/test_allocator.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/test_allocator.h?rev=196173&view=auto
==============================================================================
--- libcxx/trunk/test/re/test_allocator.h (original)
+++ libcxx/trunk/test/re/test_allocator.h (removed)
@@ -1,117 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
- static int count;
-public:
- static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(-1) {}
- explicit test_allocator(int i) throw() : data_(i) {}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {}
- ~test_allocator() throw() {data_ = 0;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void construct(pointer p, T&& val)
- {::new(p) T(std::move(val));}
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
- int data_;
-
- template <class U> friend class other_allocator;
-
-public:
- typedef T value_type;
-
- other_allocator() : data_(-1) {}
- explicit other_allocator(int i) : data_(i) {}
- template <class U> other_allocator(const other_allocator<U>& a)
- : data_(a.data_) {}
- T* allocate(std::size_t n)
- {return (T*)std::malloc(n * sizeof(T));}
- void deallocate(T* p, std::size_t n)
- {std::free(p);}
-
- other_allocator select_on_container_copy_construction() const
- {return other_allocator(-2);}
-
- friend bool operator==(const other_allocator& x, const other_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const other_allocator& x, const other_allocator& y)
- {return !(x == y);}
-
- typedef std::true_type propagate_on_container_copy_assignment;
- typedef std::true_type propagate_on_container_move_assignment;
- typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
- std::size_t max_size() const
- {return UINT_MAX / sizeof(T);}
-#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif // TEST_ALLOCATOR_H
Modified: libcxx/trunk/test/strings/basic.string/string.capacity/capacity.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.capacity/capacity.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.capacity/capacity.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.capacity/capacity.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/alloc.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/copy.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/copy.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/copy.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/copy_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/copy_alloc.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/copy_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/default_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/default_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/default_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#if __has_feature(cxx_noexcept)
Modified: libcxx/trunk/test/strings/basic.string/string.cons/initializer_list.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/initializer_list.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/initializer_list.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/initializer_list.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
int main()
Modified: libcxx/trunk/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/iter_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/iter_alloc.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/iter_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <iterator>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "../input_iterator.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/strings/basic.string/string.cons/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/move.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/move.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/move.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/move_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/move_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/move_alloc.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/move_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
Modified: libcxx/trunk/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -19,7 +19,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/strings/basic.string/string.cons/move_assignment.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/move_assignment.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/move_assignment.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/move_assignment.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/move_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/move_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/move_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -17,7 +17,7 @@
#include <string>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class charT>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class charT>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class charT>
Modified: libcxx/trunk/test/strings/basic.string/string.cons/substr.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.cons/substr.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.cons/substr.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.cons/substr.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <algorithm>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
Modified: libcxx/trunk/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <string>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
template <class T>
struct some_alloc
Modified: libcxx/trunk/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp (original)
+++ libcxx/trunk/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <string>
#include <cassert>
-#include "../../test_allocator.h"
+#include "test_allocator.h"
#include "min_allocator.h"
template <class S>
Removed: libcxx/trunk/test/strings/basic.string/test_allocator.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/strings/basic.string/test_allocator.h?rev=196173&view=auto
==============================================================================
--- libcxx/trunk/test/strings/basic.string/test_allocator.h (original)
+++ libcxx/trunk/test/strings/basic.string/test_allocator.h (removed)
@@ -1,75 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
- static int count;
-public:
- static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(-1) {}
- explicit test_allocator(int i) throw() : data_(i) {}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {}
- ~test_allocator() throw() {data_ = 0;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-#endif // TEST_ALLOCATOR_H
Added: libcxx/trunk/test/support/test_allocator.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/test_allocator.h?rev=196174&view=auto
==============================================================================
--- libcxx/trunk/test/support/test_allocator.h (added)
+++ libcxx/trunk/test/support/test_allocator.h Mon Dec 2 18:18:10 2013
@@ -0,0 +1,155 @@
+#ifndef TEST_ALLOCATOR_H
+#define TEST_ALLOCATOR_H
+
+#include <cstddef>
+#include <type_traits>
+#include <cstdlib>
+#include <new>
+#include <climits>
+#include <cassert>
+
+class test_alloc_base
+{
+protected:
+ static int time_to_throw;
+public:
+ static int throw_after;
+ static int count;
+ static int alloc_count;
+};
+
+int test_alloc_base::count = 0;
+int test_alloc_base::time_to_throw = 0;
+int test_alloc_base::alloc_count = 0;
+int test_alloc_base::throw_after = INT_MAX;
+
+template <class T>
+class test_allocator
+ : public test_alloc_base
+{
+ int data_;
+
+ template <class U> friend class test_allocator;
+public:
+
+ typedef unsigned size_type;
+ typedef int difference_type;
+ typedef T value_type;
+ typedef value_type* pointer;
+ typedef const value_type* const_pointer;
+ typedef typename std::add_lvalue_reference<value_type>::type reference;
+ typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
+
+ template <class U> struct rebind {typedef test_allocator<U> other;};
+
+ test_allocator() throw() : data_(0) {++count;}
+ explicit test_allocator(int i) throw() : data_(i) {++count;}
+ test_allocator(const test_allocator& a) throw()
+ : data_(a.data_) {++count;}
+ template <class U> test_allocator(const test_allocator<U>& a) throw()
+ : data_(a.data_) {++count;}
+ ~test_allocator() throw() {assert(data_ >= 0); --count; data_ = -1;}
+ pointer address(reference x) const {return &x;}
+ const_pointer address(const_reference x) const {return &x;}
+ pointer allocate(size_type n, const void* = 0)
+ {
+ assert(data_ >= 0);
+ if (time_to_throw >= throw_after) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ throw std::bad_alloc();
+#else
+ std::terminate();
+#endif
+ }
+ ++time_to_throw;
+ ++alloc_count;
+ return (pointer)std::malloc(n * sizeof(T));
+ }
+ void deallocate(pointer p, size_type n)
+ {assert(data_ >= 0); --alloc_count; std::free(p);}
+ size_type max_size() const throw()
+ {return UINT_MAX / sizeof(T);}
+ void construct(pointer p, const T& val)
+ {::new(p) T(val);}
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+ void construct(pointer p, T&& val)
+ {::new(p) T(std::move(val));}
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+ void destroy(pointer p) {p->~T();}
+
+ friend bool operator==(const test_allocator& x, const test_allocator& y)
+ {return x.data_ == y.data_;}
+ friend bool operator!=(const test_allocator& x, const test_allocator& y)
+ {return !(x == y);}
+};
+
+template <>
+class test_allocator<void>
+ : public test_alloc_base
+{
+ int data_;
+
+ template <class U> friend class test_allocator;
+public:
+
+ typedef unsigned size_type;
+ typedef int difference_type;
+ typedef void value_type;
+ typedef value_type* pointer;
+ typedef const value_type* const_pointer;
+
+ template <class U> struct rebind {typedef test_allocator<U> other;};
+
+ test_allocator() throw() : data_(-1) {}
+ explicit test_allocator(int i) throw() : data_(i) {}
+ test_allocator(const test_allocator& a) throw()
+ : data_(a.data_) {}
+ template <class U> test_allocator(const test_allocator<U>& a) throw()
+ : data_(a.data_) {}
+ ~test_allocator() throw() {data_ = 0;}
+
+ friend bool operator==(const test_allocator& x, const test_allocator& y)
+ {return x.data_ == y.data_;}
+ friend bool operator!=(const test_allocator& x, const test_allocator& y)
+ {return !(x == y);}
+};
+
+template <class T>
+class other_allocator
+{
+ int data_;
+
+ template <class U> friend class other_allocator;
+
+public:
+ typedef T value_type;
+
+ other_allocator() : data_(-1) {}
+ explicit other_allocator(int i) : data_(i) {}
+ template <class U> other_allocator(const other_allocator<U>& a)
+ : data_(a.data_) {}
+ T* allocate(std::size_t n)
+ {return (T*)std::malloc(n * sizeof(T));}
+ void deallocate(T* p, std::size_t n)
+ {std::free(p);}
+
+ other_allocator select_on_container_copy_construction() const
+ {return other_allocator(-2);}
+
+ friend bool operator==(const other_allocator& x, const other_allocator& y)
+ {return x.data_ == y.data_;}
+ friend bool operator!=(const other_allocator& x, const other_allocator& y)
+ {return !(x == y);}
+
+ typedef std::true_type propagate_on_container_copy_assignment;
+ typedef std::true_type propagate_on_container_move_assignment;
+ typedef std::true_type propagate_on_container_swap;
+
+#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
+ std::size_t max_size() const
+ {return UINT_MAX / sizeof(T);}
+#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
+
+};
+
+#endif // TEST_ALLOCATOR_H
Modified: libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp (original)
+++ libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp (original)
+++ libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
class A
{
Modified: libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp (original)
+++ libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <cstdlib>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int new_called = 0;
Modified: libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp (original)
+++ libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int main()
{
Modified: libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp (original)
+++ libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int new_called = 0;
Modified: libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp (original)
+++ libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <functional>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
class A
{
Removed: libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h?rev=196173&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h (original)
+++ libcxx/trunk/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h (removed)
@@ -1,117 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
- static int count;
-public:
- static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(-1) {}
- explicit test_allocator(int i) throw() : data_(i) {}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {}
- ~test_allocator() throw() {data_ = 0;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- if (count >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void construct(pointer p, T&& val)
- {::new(p) T(std::move(val));}
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
- int data_;
-
- template <class U> friend class other_allocator;
-
-public:
- typedef T value_type;
-
- other_allocator() : data_(-1) {}
- explicit other_allocator(int i) : data_(i) {}
- template <class U> other_allocator(const other_allocator<U>& a)
- : data_(a.data_) {}
- T* allocate(std::size_t n)
- {return (T*)std::malloc(n * sizeof(T));}
- void deallocate(T* p, std::size_t n)
- {std::free(p);}
-
- other_allocator select_on_container_copy_construction() const
- {return other_allocator(-2);}
-
- friend bool operator==(const other_allocator& x, const other_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const other_allocator& x, const other_allocator& y)
- {return !(x == y);}
-
- typedef std::true_type propagate_on_container_copy_assignment;
- typedef std::true_type propagate_on_container_move_assignment;
- typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
- std::size_t max_size() const
- {return UINT_MAX / sizeof(T);}
-#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif // TEST_ALLOCATOR_H
Removed: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h?rev=196173&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h (original)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h (removed)
@@ -1,82 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-#include <cassert>
-
-class test_alloc_base
-{
-protected:
- static int time_to_throw;
-public:
- static int throw_after;
- static int count;
- static int alloc_count;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::time_to_throw = 0;
-int test_alloc_base::alloc_count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
- : public test_alloc_base
-{
- int data_;
-
- template <class U> friend class test_allocator;
-public:
-
- typedef unsigned size_type;
- typedef int difference_type;
- typedef T value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
- typedef typename std::add_lvalue_reference<value_type>::type reference;
- typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
- template <class U> struct rebind {typedef test_allocator<U> other;};
-
- test_allocator() throw() : data_(0) {++count;}
- explicit test_allocator(int i) throw() : data_(i) {++count;}
- test_allocator(const test_allocator& a) throw()
- : data_(a.data_) {++count;}
- template <class U> test_allocator(const test_allocator<U>& a) throw()
- : data_(a.data_) {++count;}
- ~test_allocator() throw() {assert(data_ >= 0); --count; data_ = -1;}
- pointer address(reference x) const {return &x;}
- const_pointer address(const_reference x) const {return &x;}
- pointer allocate(size_type n, const void* = 0)
- {
- assert(data_ >= 0);
- if (time_to_throw >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw std::bad_alloc();
-#else
- std::terminate();
-#endif
- }
- ++time_to_throw;
- ++alloc_count;
- return (pointer)std::malloc(n * sizeof(T));
- }
- void deallocate(pointer p, size_type n)
- {assert(data_ >= 0); --alloc_count; std::free(p);}
- size_type max_size() const throw()
- {return UINT_MAX / sizeof(T);}
- void construct(pointer p, const T& val)
- {::new(p) T(val);}
- void destroy(pointer p) {p->~T();}
-
- friend bool operator==(const test_allocator& x, const test_allocator& y)
- {return x.data_ == y.data_;}
- friend bool operator!=(const test_allocator& x, const test_allocator& y)
- {return !(x == y);}
-};
-
-#endif // TEST_ALLOCATOR_H
Modified: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp (original)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct A
{
Modified: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp (original)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct A
{
Modified: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp (original)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct A
{
Modified: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp (original)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp Mon Dec 2 18:18:10 2013
@@ -14,7 +14,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct A
{
Modified: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp (original)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp Mon Dec 2 18:18:10 2013
@@ -18,7 +18,7 @@
#include <new>
#include <cstdlib>
#include <cassert>
-#include "../test_allocator.h"
+#include "test_allocator.h"
int new_count = 0;
Modified: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp?rev=196174&r1=196173&r2=196174&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp (original)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp Mon Dec 2 18:18:10 2013
@@ -16,7 +16,7 @@
#include <memory>
#include <cassert>
#include "../test_deleter.h"
-#include "../test_allocator.h"
+#include "test_allocator.h"
struct B
{
More information about the cfe-commits
mailing list