[libcxx] r272716 - Replace __cplusplus comparisons and dialect __has_feature checks with TEST_STD_VER.

[Eric Fiselier via cfe-commits]

This patch as un-hidden a bunch of GCC failures in `<memory>`. There are
sections of `<memory>` that only support Clang's implementation of atomic
s..
Before this patch the tests failures were hidden by "#if
__has_feature(cxx_atomics)" guards.

I'll work on fixing these failures in the coming days.

/Eric

On Tue, Jun 14, 2016 at 3:31 PM, Eric Fiselier via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Author: ericwf
> Date: Tue Jun 14 16:31:42 2016
> New Revision: 272716
>
> URL: http://llvm.org/viewvc/llvm-project?rev=272716&view=rev
> Log:
> Replace __cplusplus comparisons and dialect __has_feature checks with
> TEST_STD_VER.
>
> This is a huge cleanup that helps make the libc++ test suite more portable.
> Patch from STL at microsoft.com. Thanks STL!
>
> Modified:
>
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
>
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
>
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
>
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
>
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
>
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
>     libcxx/trunk/test/std/containers/associative/map/map.access/at.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.access/empty.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.access/iterator.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.access/max_size.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.access/size.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/compare.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp
>     libcxx/trunk/test/std/containers/associative/map/map.cons/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/default.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
>     libcxx/trunk/test/std/containers/associative/map/map.cons/move.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/clear.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
>     libcxx/trunk/test/std/containers/associative/map/map.ops/count.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.ops/equal_range.pass.cpp
>     libcxx/trunk/test/std/containers/associative/map/map.ops/find.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.special/member_swap.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
>     libcxx/trunk/test/std/containers/associative/map/types.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multimap/empty.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multimap/iterator.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multimap/max_size.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multimap/size.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multimap/types.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/clear.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/count.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/emplace.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/emplace_hint.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/empty.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/equal_range.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/erase_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/erase_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/erase_key.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/find.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/insert_cv.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/insert_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/insert_rv.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/iterator.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/lower_bound.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/max_size.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/size.pass.cpp
>     libcxx/trunk/test/std/containers/associative/multiset/types.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/multiset/upper_bound.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/clear.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/count.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/emplace.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/emplace_hint.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/empty.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/equal_range.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/erase_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/erase_iter_iter.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/erase_key.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/find.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/insert_cv.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/insert_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/insert_iter_cv.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/insert_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/insert_iter_rv.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/insert_rv.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/iterator.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/lower_bound.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/max_size.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/default.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/set.cons/move.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/associative/set/set.special/member_swap.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/size.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/types.pass.cpp
>     libcxx/trunk/test/std/containers/associative/set/upper_bound.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/swap.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/deque/iterators.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/deque/types.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/forwardlist/max_size.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/forwardlist/types.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/db_back.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/db_cback.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/db_cfront.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/db_front.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/db_iterators_6.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/db_iterators_7.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/db_iterators_8.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/iterators.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_copy.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/list.cons/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/list.cons/move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/size_type.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/clear.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/list.ops/merge.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/merge_comp.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/remove.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/remove_if.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/reverse.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/list.ops/sort.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/unique.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.ops/unique_pred.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/list/list.special/swap.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/list/types.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_copy.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/capacity.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/iterators.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/vector.bool/move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/push_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/reference.swap.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/vector.bool/reserve.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/vector.bool/swap.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/vector.bool/types.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/vector/contiguous.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/vector/iterators.pass.cpp
>     libcxx/trunk/test/std/containers/sequences/vector/types.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/capacity.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/reserve.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/swap.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.data/data.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
>
> libcxx/trunk/test/std/containers/sequences/vector/vector.special/swap.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/bucket.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/bucket_size.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/count.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/eq.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/equal_range_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/equal_range_non_const.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/find_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/find_non_const.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/iterators.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/local_iterators.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/max_size.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/rehash.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/reserve.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.map/types.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/clear.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace_hint.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/erase_range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_hint_const_lvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multimap/bucket.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multimap/count.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_7.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_8.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multimap/eq.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_non_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/find_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/find_non_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/iterators.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/load_factor.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/local_iterators.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_bucket_count.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_load_factor.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multimap/max_size.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multimap/rehash.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multimap/reserve.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/swap_member.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multimap/types.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/bucket.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/clear.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/count.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/emplace.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/emplace_hint.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/eq.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_non_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_const_iter.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_key.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/find_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/find_non_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/iterators.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/load_factor.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/local_iterators.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_bucket_count.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_load_factor.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/max_size.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/rehash.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/reserve.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/swap_member.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.multiset/types.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/bucket.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/bucket_count.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/bucket_size.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/clear.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/count.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/emplace.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/emplace_hint.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/eq.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/equal_range_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/equal_range_non_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/erase_const_iter.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/erase_key.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/erase_range.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/find_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/find_non_const.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/insert_const_lvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/insert_init.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/insert_range.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/iterators.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/load_factor.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/local_iterators.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/max_bucket_count.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/max_load_factor.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/max_size.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/rehash.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/reserve.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/swap_member.pass.cpp
>     libcxx/trunk/test/std/containers/unord/unord.set/types.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
>
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
>     libcxx/trunk/test/std/depr/depr.c.headers/stdarg_h.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.access/back.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.access/data.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.access/front.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.access/index.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/end.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp
>
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp
>     libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp
>     libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp
>     libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp
>     libcxx/trunk/test/std/iterators/iterator.range/begin-end.pass.cpp
>
> libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp
>
> libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp
>
> libcxx/trunk/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp
>
> libcxx/trunk/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
>     libcxx/trunk/test/std/language.support/support.runtime/cstdarg.pass.cpp
>     libcxx/trunk/test/std/language.support/support.types/offsetof.pass.cpp
>     libcxx/trunk/test/std/numerics/c.math/cmath.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.access/at.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.access/back.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.access/db_back.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cback.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cfront.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cindex.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.access/db_front.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.access/db_index.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.access/front.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.access/index.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.capacity/capacity.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.capacity/clear.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.capacity/empty.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.capacity/length.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.capacity/max_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.capacity/size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/begin.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/cbegin.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/cend.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/crbegin.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/crend.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/end.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/rbegin.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.iterators/rend.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_delim.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_delim_rv.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_rv.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/stream_extract.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/stream_insert.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/string.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/string_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
>
> libcxx/trunk/test/std/strings/basic.string/string.require/contiguous.pass.cpp
>     libcxx/trunk/test/std/strings/basic.string/types.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
>
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
>
> libcxx/trunk/test/std/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
>
> libcxx/trunk/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
>
> libcxx/trunk/test/std/utilities/function.objects/func.memfn/member_function.pass.cpp
>
> libcxx/trunk/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
>
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp
>     libcxx/trunk/test/std/utilities/meta/meta.hel/bool_constant.pass.cpp
>
> libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
>
> libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp
>
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
>
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
>
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
>
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
>
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
>
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
>
> libcxx/trunk/test/std/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
>
> libcxx/trunk/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
>
> libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp
>
> libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_const.pass.cpp
>
> libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp
>     libcxx/trunk/test/support/MoveOnly.h
>     libcxx/trunk/test/support/count_new.hpp
>     libcxx/trunk/test/support/min_allocator.h
>     libcxx/trunk/test/support/test_macros.h
>
> Modified:
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -57,13 +57,13 @@ test()
>      test<Iter>(1000);
>  }
>
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>  constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 };
>  #endif
>
>  void constexpr_test()
>  {
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      constexpr auto p = std::max_element(il,il+8);
>      static_assert ( *p == 8, "" );
>  #endif
>
> Modified:
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -75,14 +75,14 @@ void test_eq()
>      delete [] a;
>  }
>
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>  constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 };
>  struct less { constexpr bool operator ()( const int &x, const int &y)
> const { return x < y; }};
>  #endif
>
>  void constexpr_test()
>  {
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      constexpr auto p = std::max_element(il, il+8, less());
>      static_assert ( *p == 8, "" );
>  #endif
>
> Modified:
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -57,13 +57,13 @@ test()
>      test<Iter>(1000);
>  }
>
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>  constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 };
>  #endif
>
>  void constexpr_test()
>  {
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      constexpr auto p = std::min_element(il, il+8);
>      static_assert ( *p == 1, "" );
>  #endif
>
> Modified:
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -75,14 +75,14 @@ void test_eq()
>      delete [] a;
>  }
>
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>  constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 };
>  struct less { constexpr bool operator ()( const int &x, const int &y)
> const { return x < y; }};
>  #endif
>
>  void constexpr_test()
>  {
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>         constexpr auto p = std::min_element(il, il+8, less());
>         static_assert(*p == 1, "");
>  #endif
>
> Modified:
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -74,13 +74,13 @@ test()
>      }
>  }
>
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>  constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 };
>  #endif
>
>  void constexpr_test()
>  {
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      constexpr auto p = std::minmax_element(il, il+8);
>      static_assert ( *(p.first)  == 1, "" );
>      static_assert ( *(p.second) == 8, "" );
>
> Modified:
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -79,14 +79,14 @@ test()
>      }
>  }
>
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>  constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 };
>  struct less { constexpr bool operator ()( const int &x, const int &y)
> const { return x < y; }};
>  #endif
>
>  void constexpr_test()
>  {
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      constexpr auto p = std::minmax_element(il, il+8, less());
>      static_assert ( *(p.first)  == 1, "" );
>      static_assert ( *(p.second) == 8, "" );
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.access/at.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.access/at.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.access/at.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.access/at.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>          assert(m.at(8) == 8.5);
>          assert(m.size() == 7);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<const int, double> V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.access/empty.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.access/empty.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.access/empty.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.access/empty.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      m.clear();
>      assert(m.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.access/iterator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.access/iterator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.access/iterator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.access/iterator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -119,7 +119,7 @@ int main()
>              assert(i->second == 1);
>          }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<const int, double> V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.access/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.access/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.access/max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.access/max_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      M m;
>      assert(m.max_size() != 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.access/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.access/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.access/size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.access/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -37,7 +37,7 @@ int main()
>      m.erase(m.begin());
>      assert(m.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      assert(m.begin() == m.end());
>      assert(m.get_allocator() == A(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::less<int> C;
>      typedef min_allocator<std::pair<const int, double> > A;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      assert(*next(m.begin()) == V(2, 1));
>      assert(*next(m.begin(), 2) == V(3, 1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      std::map<int, double, std::less<int>, min_allocator<V>> m =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/compare.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/compare.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/compare.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/compare.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(m.begin() == m.end());
>      assert(m.key_comp() == C(3));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef test_compare<std::less<int> > C;
>      std::map<int, double, C, min_allocator<std::pair<const int, double>>>
> m(C(3));
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      assert(m.key_comp() == C(4));
>      assert(m.get_allocator() == A(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef test_compare<std::less<int> > C;
>      typedef min_allocator<std::pair<const int, double> > A;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -92,7 +92,7 @@ int main()
>          assert(*next(mo.begin(), 2) == V(3, 1));
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<const int, double> V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -56,7 +56,7 @@ int main()
>      assert(*next(mo.begin()) == V(2, 1));
>      assert(*next(mo.begin(), 2) == V(3, 1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -107,7 +107,7 @@ int main()
>          assert(*next(mo.begin()) == V(2, 1));
>          assert(*next(mo.begin(), 2) == V(3, 1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<const int, double> V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      assert(m.empty());
>      assert(m.begin() == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::map<int, double, std::less<int>, min_allocator<std::pair<const
> int, double>>> m;
>      assert(m.empty());
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <map>
>  #include <cassert>
>
> @@ -33,7 +35,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      typedef std::pair<const MoveOnly, MoveOnly> V;
>      {
>          typedef std::map<MoveOnly, MoveOnly> C;
> @@ -51,5 +52,4 @@ int main()
>          typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~map() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <map>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_comp
>  {
> @@ -27,11 +27,8 @@ struct some_comp
>      bool operator()(const T&, const T&) const noexcept { return false; }
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      typedef std::pair<const MoveOnly, MoveOnly> V;
>      {
>          typedef std::map<MoveOnly, MoveOnly> C;
> @@ -49,5 +46,4 @@ int main()
>          typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>      assert(*next(m.begin()) == V(2, 1));
>      assert(*next(m.begin(), 2) == V(3, 1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      std::map<int, double, std::less<int>, min_allocator<V>> m =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>      assert(*next(m.begin(), 2) == V(3, 1));
>      assert(m.key_comp() == C(3));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      typedef test_compare<std::less<int> > C;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      assert(m.key_comp() == C(3));
>      assert(m.get_allocator() == A(6));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      typedef test_compare<std::less<int> > C;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>      assert(*next(m.begin()) == V(2, 1));
>      assert(*next(m.begin(), 2) == V(3, 1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      assert(*next(m.begin()) == V(2, 1));
>      assert(*next(m.begin(), 2) == V(3, 1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>      assert(*next(m.begin()) == V(2, 1));
>      assert(*next(m.begin(), 2) == V(3, 1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/move.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -69,7 +69,7 @@ int main()
>          assert(mo.size() == 0);
>          assert(distance(mo.begin(), mo.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_compare<std::less<int> > C;
>          typedef min_allocator<V> A;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -189,7 +189,7 @@ int main()
>          }
>          assert(Counter_base::gConstructed == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<MoveOnly, MoveOnly> V;
>          typedef std::pair<const MoveOnly, MoveOnly> VC;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -144,7 +144,7 @@ int main()
>          assert(m3.key_comp() == C(5));
>          assert(m1.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<MoveOnly, MoveOnly> V;
>          typedef std::pair<const MoveOnly, MoveOnly> VC;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <map>
>  #include <cassert>
>
> @@ -33,7 +35,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      typedef std::pair<const MoveOnly, MoveOnly> V;
>      {
>          typedef std::map<MoveOnly, MoveOnly> C;
> @@ -51,5 +52,4 @@ int main()
>          typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <map>
>  #include <cassert>
>
> @@ -31,7 +33,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      typedef std::pair<const MoveOnly, MoveOnly> V;
>      {
>          typedef std::map<MoveOnly, MoveOnly> C;
> @@ -49,5 +50,4 @@ int main()
>          typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.modifiers/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/clear.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>          m.clear();
>          assert(m.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -92,7 +92,7 @@ int main()
>          assert(m.begin()->first == 2);
>          assert(m.begin()->second == 3.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::map<int, DefaultOnly, std::less<int>,
> min_allocator<std::pair<const int, DefaultOnly>>> M;
>          typedef std::pair<M::iterator, bool> R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -89,7 +89,7 @@ int main()
>          assert(m.begin()->first == 2);
>          assert(m.begin()->second == 3.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::map<int, DefaultOnly, std::less<int>,
> min_allocator<std::pair<const int, DefaultOnly>>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -134,7 +134,7 @@ int main()
>          assert(i == m.begin());
>          assert(i == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
> @@ -242,7 +242,7 @@ int main()
>          assert(i == m.end());
>      }
>  #endif
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      {
>      //  This is LWG #2059
>          typedef TemplateConstructor T;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>          assert(i == m.begin());
>          assert(i == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -145,7 +145,7 @@ int main()
>          assert(m.size() == 0);
>          assert(s == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>      assert(*next(m.begin()) == V(2, 1));
>      assert(*next(m.begin(), 2) == V(3, 1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      std::map<int, double, std::less<int>, min_allocator<V>> m =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(next(m.begin(), 2)->first == 3);
>          assert(next(m.begin(), 2)->second == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.ops/count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.ops/count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.ops/count.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.ops/count.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(r == 0);
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.ops/equal_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.ops/equal_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.ops/equal_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.ops/equal_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -159,7 +159,7 @@ int main()
>          assert(r.second == next(m.begin(), 8));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.ops/find.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.ops/find.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/map/map.ops/find.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/map/map.ops/find.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -93,7 +93,7 @@ int main()
>          assert(r == next(m.begin(), 8));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -125,7 +125,7 @@ int main()
>          assert(r == next(m.begin(), 8));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -124,7 +124,7 @@ int main()
>          assert(r == next(m.begin(), 8));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.special/member_swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.special/member_swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.special/member_swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.special/member_swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -96,7 +96,7 @@ int main()
>          assert(m2 == m1_save);
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
>      {
>
> Modified:
> libcxx/trunk/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -167,7 +167,7 @@ int main()
>          assert(m2.key_comp() == C(1));
>          assert(m2.get_allocator() == A(1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
>      {
>
> Modified: libcxx/trunk/test/std/containers/associative/map/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/map/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/map/types.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>      static_assert((std::is_same<C::size_type, std::size_t>::value), "");
>      static_assert((std::is_same<C::difference_type,
> std::ptrdiff_t>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::map<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> C;
>      static_assert((std::is_same<C::key_type, int>::value), "");
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/empty.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/empty.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multimap/empty.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multimap/empty.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      m.clear();
>      assert(m.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/iterator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/iterator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/iterator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/iterator.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -121,7 +121,7 @@ int main()
>                  assert(i->second == d);
>              }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<const int, double> V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/max_size.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      M m;
>      assert(m.max_size() != 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      assert(m.begin() == m.end());
>      assert(m.get_allocator() == A(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::less<int> C;
>      typedef min_allocator<std::pair<const int, double> > A;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>      assert(*++i == V(3, 1.5));
>      assert(*++i == V(3, 2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(m.begin() == m.end());
>      assert(m.key_comp() == C(3));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef test_compare<std::less<int> > C;
>      std::multimap<int, double, C, min_allocator<std::pair<const int,
> double>>> m(C(3));
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      assert(m.key_comp() == C(4));
>      assert(m.get_allocator() == A(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef test_compare<std::less<int> > C;
>      typedef min_allocator<std::pair<const int, double> > A;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -74,7 +74,7 @@ int main()
>          assert(mo.key_comp() == C(5));
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<const int, double> V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>      assert(mo.get_allocator() == A(7));
>      assert(mo.key_comp() == C(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -94,7 +94,7 @@ int main()
>          assert(mo.get_allocator() == A(2));
>          assert(mo.key_comp() == C(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<const int, double> V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      assert(m.empty());
>      assert(m.begin() == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> m;
>      assert(m.empty());
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <map>
>  #include <cassert>
>
> @@ -33,7 +35,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      typedef std::pair<const MoveOnly, MoveOnly> V;
>      {
>          typedef std::multimap<MoveOnly, MoveOnly> C;
> @@ -51,5 +52,4 @@ int main()
>          typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~multimap() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <map>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_comp
>  {
> @@ -27,11 +27,8 @@ struct some_comp
>      bool operator()(const T&, const T&) const { return false; }
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      typedef std::pair<const MoveOnly, MoveOnly> V;
>      {
>          typedef std::multimap<MoveOnly, MoveOnly> C;
> @@ -49,5 +46,4 @@ int main()
>          typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>      assert(*++i == V(3, 1.5));
>      assert(*++i == V(3, 2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -53,7 +53,7 @@ int main()
>      assert(*++i == V(3, 2));
>      assert(m.key_comp() == Cmp(4));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef test_compare<std::less<int> > Cmp;
>      typedef std::multimap<int, double, Cmp, min_allocator<std::pair<const
> int, double>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -57,7 +57,7 @@ int main()
>      assert(m.get_allocator() == A(5));
>      }
>  #endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef test_compare<std::less<int> > Cmp;
>      typedef min_allocator<std::pair<const int, double> > A;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>      assert(*next(m.begin(), 7) == V(3, 1.5));
>      assert(*next(m.begin(), 8) == V(3, 2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>      assert(*next(m.begin(), 7) == V(3, 1.5));
>      assert(*next(m.begin(), 8) == V(3, 2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -55,7 +55,7 @@ int main()
>      assert(*next(m.begin(), 7) == V(3, 1.5));
>      assert(*next(m.begin(), 8) == V(3, 2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::pair<const int, double> V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -75,7 +75,7 @@ int main()
>          assert(mo.size() == 0);
>          assert(distance(mo.begin(), mo.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_compare<std::less<int> > C;
>          typedef min_allocator<V> A;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -189,7 +189,7 @@ int main()
>          }
>          assert(Counter_base::gConstructed == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<MoveOnly, MoveOnly> V;
>          typedef std::pair<const MoveOnly, MoveOnly> VC;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -144,7 +144,7 @@ int main()
>          assert(m3.key_comp() == C(5));
>          assert(m1.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<MoveOnly, MoveOnly> V;
>          typedef std::pair<const MoveOnly, MoveOnly> VC;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <map>
>  #include <cassert>
>
> @@ -33,7 +35,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      typedef std::pair<const MoveOnly, MoveOnly> V;
>      {
>          typedef std::multimap<MoveOnly, MoveOnly> C;
> @@ -51,5 +52,4 @@ int main()
>          typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <map>
>  #include <cassert>
>
> @@ -31,7 +33,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      typedef std::pair<const MoveOnly, MoveOnly> V;
>      {
>          typedef std::multimap<MoveOnly, MoveOnly> C;
> @@ -49,5 +50,4 @@ int main()
>          typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>          m.clear();
>          assert(m.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -84,7 +84,7 @@ int main()
>          assert(m.begin()->first == 2);
>          assert(m.begin()->second == 3.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multimap<int, DefaultOnly, std::less<int>,
> min_allocator<std::pair<const int, DefaultOnly>>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -89,7 +89,7 @@ int main()
>          assert(m.begin()->first == 2);
>          assert(m.begin()->second == 3.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multimap<int, DefaultOnly, std::less<int>,
> min_allocator<std::pair<const int, DefaultOnly>>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -155,7 +155,7 @@ int main()
>          assert(i == m.begin());
>          assert(i == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
> @@ -284,7 +284,7 @@ int main()
>          assert(i == m.end());
>      }
>  #endif
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      {
>      //  This is LWG #2059
>          typedef TemplateConstructor T;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>          assert(i == m.begin());
>          assert(i == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -84,7 +84,7 @@ int main()
>          assert(m.size() == 0);
>          assert(i == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -53,7 +53,7 @@ int main()
>      assert(*++i == V(3, 2));
>      assert(*++i == V(3, 1.5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(next(m.begin(), 8)->first == 3);
>          assert(next(m.begin(), 8)->second == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>          typedef std::pair<int, double> P;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -56,7 +56,7 @@ int main()
>          assert(r == 0);
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      {
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -101,7 +101,7 @@ int main()
>          assert(r.second == m.end());
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      {
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -83,7 +83,7 @@ int main()
>          assert(r == m.end());
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      {
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -87,7 +87,7 @@ int main()
>          assert(r == m.end());
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      {
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -87,7 +87,7 @@ int main()
>          assert(r == m.end());
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      {
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -96,7 +96,7 @@ int main()
>          assert(m2 == m1_save);
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      {
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -167,7 +167,7 @@ int main()
>          assert(m2.key_comp() == C(1));
>          assert(m2.get_allocator() == A(1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      {
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multimap/size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multimap/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -37,7 +37,7 @@ int main()
>      m.erase(m.begin());
>      assert(m.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multimap/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multimap/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multimap/types.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>      static_assert((std::is_same<C::size_type, std::size_t>::value), "");
>      static_assert((std::is_same<C::difference_type,
> std::ptrdiff_t>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multimap<int, double, std::less<int>,
> min_allocator<std::pair<const int, double>>> C;
>      static_assert((std::is_same<C::key_type, int>::value), "");
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multiset/clear.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multiset/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>          m.clear();
>          assert(m.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multiset/count.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multiset/count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -55,7 +55,7 @@ int main()
>          assert(r == 0);
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multiset/emplace.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multiset/emplace.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(m.size() == 1);
>          assert(*r == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/emplace_hint.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/emplace_hint.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/emplace_hint.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/emplace_hint.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(m.size() == 1);
>          assert(*r == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/empty.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/empty.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multiset/empty.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multiset/empty.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      m.clear();
>      assert(m.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/equal_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/equal_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/equal_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/equal_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -100,7 +100,7 @@ int main()
>          assert(r.second == next(m.begin(), 9));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/erase_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/erase_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/erase_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/erase_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -106,7 +106,7 @@ int main()
>          assert(i == m.begin());
>          assert(i == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
> @@ -186,7 +186,7 @@ int main()
>          assert(i == m.end());
>      }
>  #endif
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      {
>      //  This is LWG #2059
>          typedef TemplateConstructor T;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/erase_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/erase_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/erase_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/erase_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -78,7 +78,7 @@ int main()
>          assert(m.size() == 0);
>          assert(i == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/erase_key.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/erase_key.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/erase_key.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/erase_key.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -72,7 +72,7 @@ int main()
>          assert(m.size() == 0);
>          assert(i == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/find.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/find.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multiset/find.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multiset/find.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -92,7 +92,7 @@ int main()
>              assert(r == next(m.begin(), 8));
>          }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int V;
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/insert_cv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/insert_cv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/insert_cv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/insert_cv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(m.size() == 4);
>          assert(*r == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/insert_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/insert_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/insert_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/insert_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>      assert(*++i == V(10));
>      }
>  #endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(m.size() == 4);
>          assert(*r == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -51,7 +51,7 @@ int main()
>          assert(*next(m.begin(), 7) == 3);
>          assert(*next(m.begin(), 8) == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(*r == 3);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<MoveOnly, std::less<MoveOnly>,
> min_allocator<MoveOnly>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/insert_rv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/insert_rv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/insert_rv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/insert_rv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(*r == 3);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::multiset<MoveOnly, std::less<MoveOnly>,
> min_allocator<MoveOnly>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/iterator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/iterator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/iterator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/iterator.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -113,7 +113,7 @@ int main()
>              for (int k = 0; k < 3; ++k, ++i)
>                  assert(*i == j);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/lower_bound.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/lower_bound.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/lower_bound.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/lower_bound.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>              assert(r == next(m.begin(), 9));
>          }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int V;
>          typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/max_size.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      M m;
>      assert(m.max_size() != 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -37,7 +37,7 @@ int main()
>      assert(*++i == V(6));
>      }
>  #endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      assert(m.empty());
>      assert(m.begin() == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::multiset<int, std::less<int>, min_allocator<int>> m;
>      assert(m.empty());
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <set>
>  #include <cassert>
>
> @@ -33,7 +35,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::multiset<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -50,5 +51,4 @@ int main()
>          typedef std::multiset<MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~multiset() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <set>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_comp
>  {
> @@ -27,11 +27,8 @@ struct some_comp
>      bool operator()(const T&, const T&) const { return false; }
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::multiset<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -48,5 +45,4 @@ int main()
>          typedef std::multiset<MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -36,7 +36,7 @@ int main()
>      assert(*++i == V(6));
>      }
>  #endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>      assert(*next(m.begin(), 7) == 3);
>      assert(*next(m.begin(), 8) == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -77,7 +77,7 @@ int main()
>          assert(distance(mo.begin(), mo.end()) == 0);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -142,7 +142,7 @@ int main()
>          assert(m1.empty());
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef MoveOnly V;
>          typedef test_compare<std::less<MoveOnly> > C;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <set>
>  #include <cassert>
>
> @@ -33,7 +35,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::multiset<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -50,5 +51,4 @@ int main()
>          typedef std::multiset<MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <set>
>  #include <cassert>
>
> @@ -31,7 +33,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::multiset<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -48,5 +49,4 @@ int main()
>          typedef std::multiset<MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -96,7 +96,7 @@ int main()
>          assert(m2 == m1_save);
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multiset/size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multiset/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -37,7 +37,7 @@ int main()
>      m.erase(m.begin());
>      assert(m.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/multiset/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/multiset/types.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>      static_assert((std::is_same<C::size_type, std::size_t>::value), "");
>      static_assert((std::is_same<C::difference_type,
> std::ptrdiff_t>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> C;
>      static_assert((std::is_same<C::key_type, int>::value), "");
>
> Modified:
> libcxx/trunk/test/std/containers/associative/multiset/upper_bound.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multiset/upper_bound.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/multiset/upper_bound.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/multiset/upper_bound.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>          assert(r == next(m.begin(), 9));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
>
> Modified: libcxx/trunk/test/std/containers/associative/set/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/clear.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/clear.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>          m.clear();
>          assert(m.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
>
> Modified: libcxx/trunk/test/std/containers/associative/set/count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/count.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/count.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -56,7 +56,7 @@ int main()
>          r = m.count(4);
>          assert(r == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int V;
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>
> Modified: libcxx/trunk/test/std/containers/associative/set/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/emplace.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/emplace.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -74,7 +74,7 @@ int main()
>          assert(m.size() == 1);
>          assert(*r.first == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef std::pair<M::iterator, bool> R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/emplace_hint.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/emplace_hint.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/emplace_hint.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/emplace_hint.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(m.size() == 1);
>          assert(*r == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef M::iterator R;
>
> Modified: libcxx/trunk/test/std/containers/associative/set/empty.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/empty.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/empty.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/empty.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      m.clear();
>      assert(m.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::set<int, std::less<int>, min_allocator<int>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/equal_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/equal_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/equal_range.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/equal_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -158,7 +158,7 @@ int main()
>          assert(r.second == next(m.begin(), 8));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::set<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/erase_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/erase_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/erase_iter.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/erase_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -106,7 +106,7 @@ int main()
>          assert(i == m.begin());
>          assert(i == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
> @@ -186,7 +186,7 @@ int main()
>          assert(i == m.end());
>      }
>  #endif
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      {
>      //  This is LWG #2059
>          typedef TemplateConstructor T;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/erase_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/erase_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/erase_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/erase_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -78,7 +78,7 @@ int main()
>          assert(m.size() == 0);
>          assert(i == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/erase_key.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/erase_key.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/erase_key.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/erase_key.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -109,7 +109,7 @@ int main()
>          assert(m.size() == 0);
>          assert(i == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
>
> Modified: libcxx/trunk/test/std/containers/associative/set/find.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/find.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/find.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/find.pass.cpp Tue Jun
> 14 16:31:42 2016
> @@ -92,7 +92,7 @@ int main()
>          assert(r == next(m.begin(), 8));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::set<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/insert_cv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/insert_cv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/insert_cv.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/insert_cv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(m.size() == 3);
>          assert(*r.first == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef std::pair<M::iterator, bool> R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/insert_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/insert_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/insert_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/insert_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>      assert(*++i == V(8));
>      assert(*++i == V(10));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::set<int, std::less<int>, min_allocator<int>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/insert_iter_cv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/insert_iter_cv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/insert_iter_cv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/insert_iter_cv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(m.size() == 3);
>          assert(*r == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/insert_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/insert_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/insert_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/insert_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(*next(m.begin()) == 2);
>          assert(*next(m.begin(), 2) == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<int, std::less<int>, min_allocator<int>> M;
>          typedef int V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/insert_iter_rv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/insert_iter_rv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/insert_iter_rv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/insert_iter_rv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(m.size() == 3);
>          assert(*r == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<MoveOnly, std::less<MoveOnly>,
> min_allocator<MoveOnly>> M;
>          typedef M::iterator R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/insert_rv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/insert_rv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/insert_rv.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/insert_rv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>          assert(m.size() == 3);
>          assert(*r.first == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::set<MoveOnly, std::less<MoveOnly>,
> min_allocator<MoveOnly>> M;
>          typedef std::pair<M::iterator, bool> R;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/iterator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/iterator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/iterator.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/iterator.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -111,7 +111,7 @@ int main()
>          for (int j = 1; j <= m.size(); ++j, ++i)
>              assert(*i == j);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/lower_bound.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/lower_bound.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/lower_bound.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/lower_bound.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -124,7 +124,7 @@ int main()
>          assert(r == next(m.begin(), 8));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::set<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/max_size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/max_size.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      M m;
>      assert(m.max_size() != 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::set<int, std::less<int>, min_allocator<int>> M;
>      M m;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/assign_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -36,7 +36,7 @@ int main()
>      assert(*++i == V(5));
>      assert(*++i == V(6));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::set<int, std::less<int>, min_allocator<int>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      assert(m.empty());
>      assert(m.begin() == m.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::set<int, std::less<int>, min_allocator<int>> m;
>      assert(m.empty());
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <set>
>  #include <cassert>
>
> @@ -33,7 +35,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::set<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -50,5 +51,4 @@ int main()
>          typedef std::set<MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~set() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <set>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_comp
>  {
> @@ -27,11 +27,8 @@ struct some_comp
>      bool operator()(const T&, const T&) const { return false; }
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::set<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -48,5 +45,4 @@ int main()
>          typedef std::set<MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>      assert(*++i == V(5));
>      assert(*++i == V(6));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::set<int, std::less<int>, min_allocator<int>> C;
>      typedef C::value_type V;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>      assert(*next(m.begin()) == 2);
>      assert(*next(m.begin(), 2) == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/move.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -70,7 +70,7 @@ int main()
>          assert(mo.size() == 0);
>          assert(distance(mo.begin(), mo.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int V;
>          V ar[] =
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -141,7 +141,7 @@ int main()
>          assert(m3.key_comp() == C(5));
>          assert(m1.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef MoveOnly V;
>          typedef test_compare<std::less<MoveOnly> > C;
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <set>
>  #include <cassert>
>
> @@ -33,7 +35,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::set<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -50,5 +51,4 @@ int main()
>          typedef std::set<MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <set>
>  #include <cassert>
>
> @@ -31,7 +33,6 @@ struct some_comp
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::set<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -48,5 +49,4 @@ int main()
>          typedef std::set<MoveOnly, some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/set.special/member_swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/set.special/member_swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/associative/set/set.special/member_swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/associative/set/set.special/member_swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -96,7 +96,7 @@ int main()
>          assert(m2 == m1_save);
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::set<int, std::less<int>, min_allocator<int>> M;
>
> Modified: libcxx/trunk/test/std/containers/associative/set/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/size.pass.cpp Tue Jun
> 14 16:31:42 2016
> @@ -37,7 +37,7 @@ int main()
>      m.erase(m.begin());
>      assert(m.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::set<int, std::less<int>, min_allocator<int>> M;
>      M m;
>
> Modified: libcxx/trunk/test/std/containers/associative/set/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/types.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>      static_assert((std::is_same<C::size_type, std::size_t>::value), "");
>      static_assert((std::is_same<C::difference_type,
> std::ptrdiff_t>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::set<int, std::less<int>, min_allocator<int>> C;
>      static_assert((std::is_same<C::key_type, int>::value), "");
>
> Modified:
> libcxx/trunk/test/std/containers/associative/set/upper_bound.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/set/upper_bound.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/associative/set/upper_bound.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/associative/set/upper_bound.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -124,7 +124,7 @@ int main()
>          assert(r == next(m.begin(), 8));
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int V;
>      typedef std::set<int, std::less<int>, min_allocator<int>> M;
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -22,10 +24,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::priority_queue<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,6 +11,8 @@
>
>  // ~priority_queue() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -18,10 +20,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::priority_queue<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -22,10 +24,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::priority_queue<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -22,10 +24,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::priority_queue<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -22,11 +24,9 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::priority_queue<MoveOnly> C;
>          C c1, c2;
>          static_assert(noexcept(swap(c1, c2)), "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -21,10 +23,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::queue<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,6 +11,8 @@
>
>  // ~queue() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -18,10 +20,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::queue<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -21,10 +23,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::queue<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -21,10 +23,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::queue<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <queue>
>  #include <cassert>
>
> @@ -21,11 +23,9 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::queue<MoveOnly> C;
>          C c1, c2;
>          static_assert(noexcept(swap(c1, c2)), "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <stack>
>  #include <cassert>
>
> @@ -21,10 +23,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::stack<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,6 +11,8 @@
>
>  // ~stack() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <stack>
>  #include <cassert>
>
> @@ -18,10 +20,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::stack<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <stack>
>  #include <cassert>
>
> @@ -21,10 +23,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::stack<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <stack>
>  #include <cassert>
>
> @@ -21,10 +23,8 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::stack<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <stack>
>  #include <cassert>
>
> @@ -21,11 +23,9 @@
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::stack<MoveOnly> C;
>          C c1, c2;
>          static_assert(noexcept(swap(c1, c2)), "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(c.front() == 0);
>          assert(c.back() == 9);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::deque<int, min_allocator<int>> c = make<std::deque<int,
> min_allocator<int>> >(10);
>          for (unsigned i = 0; i < 10; ++i)
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>  {
>      test<int>(std::allocator<int>());
>      test<NotConstructible>(test_allocator<NotConstructible>(3));
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test<int>(min_allocator<int>());
>      test<NotConstructible>(min_allocator<NotConstructible>{});
>  #endif
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(d[2] == 5);
>      assert(d[3] == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::deque<int, min_allocator<int>> d;
>      d.assign({3, 4, 5, 6});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(v2.get_allocator() == other_allocator<int>(-2));
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
>          int* an = ab + sizeof(ab)/sizeof(ab[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ int main()
>          test(std::deque<int, other_allocator<int> >(ab, an,
> other_allocator<int>(3)),
>
>  other_allocator<int>(4));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
>          int* an = ab + sizeof(ab)/sizeof(ab[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -24,7 +24,7 @@ test()
>  {
>      std::deque<T, Allocator> d;
>      assert(d.size() == 0);
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      std::deque<T, Allocator> d1 = {};
>      assert(d1.size() == 0);
>  #endif
> @@ -34,7 +34,7 @@ int main()
>  {
>      test<int, std::allocator<int> >();
>      test<NotConstructible, stack_allocator<NotConstructible, 1> >();
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test<int, min_allocator<int> >();
>      test<NotConstructible, min_allocator<NotConstructible> >();
>  #endif
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <deque>
>  #include <cassert>
>
> @@ -29,7 +31,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::deque<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -46,5 +47,4 @@ int main()
>          typedef std::deque<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~deque() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <deque>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_alloc
>  {
> @@ -27,11 +27,8 @@ struct some_alloc
>      ~some_alloc() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::deque<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -48,5 +45,4 @@ int main()
>          typedef std::deque<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -27,7 +27,7 @@ int main()
>      assert(d[2] == 5);
>      assert(d[3] == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::deque<int, min_allocator<int>> d = {3, 4, 5, 6};
>      assert(d.size() == 4);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      assert(d[2] == 5);
>      assert(d[3] == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::deque<int, min_allocator<int>> d({3, 4, 5, 6},
> min_allocator<int>());
>      assert(d.get_allocator() == min_allocator<int>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -56,7 +56,7 @@ int main()
>      test(bidirectional_iterator<const int*>(ab),
> bidirectional_iterator<const int*>(an));
>      test(random_access_iterator<const int*>(ab),
> random_access_iterator<const int*>(an));
>      test<stack_allocator<int, 4096> >(ab, an);
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test<min_allocator<int> >(ab, an);
>  #endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>      test(forward_iterator<const int*>(ab), forward_iterator<const
> int*>(an), test_allocator<int>(4));
>      test(bidirectional_iterator<const int*>(ab),
> bidirectional_iterator<const int*>(an), test_allocator<int>(5));
>      test(random_access_iterator<const int*>(ab),
> random_access_iterator<const int*>(an), test_allocator<int>(6));
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test(input_iterator<const int*>(ab), input_iterator<const int*>(an),
> min_allocator<int>());
>      test(forward_iterator<const int*>(ab), forward_iterator<const
> int*>(an), min_allocator<int>());
>      test(bidirectional_iterator<const int*>(ab),
> bidirectional_iterator<const int*>(an), min_allocator<int>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -51,7 +51,7 @@ int main()
>          assert(c1.size() == 0);
>          assert(c3.get_allocator() == c1.get_allocator());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
>          int* an = ab + sizeof(ab)/sizeof(ab[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -66,7 +66,7 @@ int main()
>          assert(c3.get_allocator() == A(3));
>          assert(c1.size() != 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
>          int* an = ab + sizeof(ab)/sizeof(ab[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -69,7 +69,7 @@ int main()
>          assert(c1.size() == 0);
>          assert(c3.get_allocator() == A(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
>          int* an = ab + sizeof(ab)/sizeof(ab[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,6 +16,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <deque>
>  #include <cassert>
>
> @@ -31,7 +33,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::deque<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -48,5 +49,4 @@ int main()
>          typedef std::deque<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <deque>
>  #include <cassert>
>
> @@ -29,7 +31,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::deque<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -46,5 +47,4 @@ int main()
>          typedef std::deque<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(l2 == l);
>          assert(l2.get_allocator() == other_allocator<int>(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
>          int* an = ab + sizeof(ab)/sizeof(ab[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(d[2] == 5);
>      assert(d[3] == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::deque<int, min_allocator<int>> d;
>      d = {3, 4, 5, 6};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -100,7 +100,7 @@ int main()
>
>      test1<DefaultOnly, stack_allocator<DefaultOnly, 4096> >(4095);
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test<DefaultOnly, min_allocator<DefaultOnly> >(4095);
>  #endif
>
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test<int, std::allocator<int> >(4096, 1165);
>      test<int, std::allocator<int> >(4097, 157);
>      test<int, stack_allocator<int, 4096> >(4095, 90);
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test<int, min_allocator<int> >(4095, 90);
>  #endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>      test(4096, 1165, a);
>      test(4097, 157, a);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      min_allocator<int> a;
>      test(0, 5, a);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -74,7 +74,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<Emplaceable> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -74,7 +74,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<Emplaceable> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -80,7 +80,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -72,7 +72,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -72,7 +72,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -62,7 +62,7 @@ int main()
>      for (int j = 0; j < N; ++j)
>          test<std::deque<int> >(rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2046, 2047, 2048, 2049,
> 4094, 4095, 4096};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>      for (int j = 0; j < N; ++j)
>          test<std::deque<MoveOnly> >(rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2046, 2047, 2048, 2049,
> 4094, 4095, 4096};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -71,7 +71,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>     {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -77,7 +77,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<MoveOnly> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -76,7 +76,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -75,7 +75,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.special/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -75,7 +75,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -75,7 +75,7 @@ int main()
>          for (int j = 0; j < N; ++j)
>              testN<std::deque<int> >(rng[i], rng[j]);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>      const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/deque.special/swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/deque/deque.special/swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -85,7 +85,7 @@ int main()
>          assert((c2 == std::deque<int, A>(a1,
> a1+sizeof(a1)/sizeof(a1[0]))));
>          assert(c2.get_allocator() == A(1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
>          const int N = sizeof(rng)/sizeof(rng[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/deque/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/deque/iterators.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/deque/iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      j = c.cbegin();
>      assert(i == j);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::deque<int, min_allocator<int>> C;
>      C c;
>
> Modified: libcxx/trunk/test/std/containers/sequences/deque/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/deque/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/deque/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/deque/types.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -80,7 +80,7 @@ int main()
>      static_assert((std::is_same<std::deque<char>::allocator_type,
>                                  std::allocator<char> >::value), "");
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::deque<short, min_allocator<short>> C;
>          static_assert((std::is_same<C::value_type, short>::value), "");
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>          assert(c.front() == 0);
>          assert(*c.begin() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>          assert(c.get_allocator() == A(12));
>          assert(c.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<NotConstructible> A;
>          typedef A::value_type T;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -117,7 +117,7 @@ int main()
>          assert(c1 == c0);
>          assert(c1.get_allocator() == A(10));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef min_allocator<int> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>              assert(*i == 10+n);
>          assert(n == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -159,7 +159,7 @@ int main()
>          assert(c1.get_allocator() == A(10));
>          assert(c0.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef MoveOnly T;
>          typedef min_allocator<T> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>              assert(*i == 10+n);
>          assert(n == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>              assert(*i == 10+n);
>          assert(n == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>              assert(*i == 10);
>          assert(n == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>          assert(c.get_allocator() == A(-2));
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef min_allocator<int> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(c == c0);
>          assert(c.get_allocator() == A(9));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef min_allocator<int> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -24,7 +24,7 @@ int main()
>          C c;
>          assert(c.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <forward_list>
>  #include <cassert>
>
> @@ -29,7 +31,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::forward_list<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -46,5 +47,4 @@ int main()
>          typedef std::forward_list<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~forward_list() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <forward_list>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_alloc
>  {
> @@ -27,11 +27,8 @@ struct some_alloc
>      ~some_alloc() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::forward_list<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -48,5 +45,4 @@ int main()
>          typedef std::forward_list<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>              assert(*i == n);
>          assert(n == 10);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>          assert(n == 10);
>          assert(c.get_allocator() == A(14));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef min_allocator<T> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          assert(c0.empty());
>          assert(c.get_allocator() == A(10));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef MoveOnly T;
>          typedef min_allocator<T> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          assert(!c0.empty());
>          assert(c.get_allocator() == A(9));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef MoveOnly T;
>          typedef min_allocator<T> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,6 +16,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <forward_list>
>  #include <cassert>
>
> @@ -31,7 +33,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::forward_list<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -48,5 +49,4 @@ int main()
>          typedef std::forward_list<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <forward_list>
>  #include <cassert>
>
> @@ -29,7 +31,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::forward_list<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -46,5 +47,4 @@ int main()
>          typedef std::forward_list<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>              assert(*i == n);
>          assert(n == std::end(t) - std::begin(t));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -36,7 +36,7 @@ int main()
>          assert(n == std::end(t) - std::begin(t));
>          assert(c.get_allocator() == A(13));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef min_allocator<T> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>  #endif
>          assert(n == N);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef DefaultOnly T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>              assert(*i == v);
>          assert(n == N);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          assert(n == N);
>          assert(c.get_allocator() == A(12));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<int> A;
>          typedef A::value_type T;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -60,7 +60,7 @@ int main()
>          C::const_iterator i = c.before_begin();
>          assert(std::distance(i, c.end()) == 11);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -71,7 +71,7 @@ int main()
>          C::iterator i;
>          C::const_iterator j;
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>          c.clear();
>          assert(distance(c.begin(), c.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef NotConstructible T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          assert(*next(c.begin(), 3) == Emplaceable(2, 3.5));
>          assert(distance(c.begin(), c.end()) == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef Emplaceable T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          assert(*next(c.begin()) == Emplaceable());
>          assert(distance(c.begin(), c.end()) == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef Emplaceable T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -84,7 +84,7 @@ int main()
>          assert(i == c.end());
>          assert(distance(c.begin(), c.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -55,7 +55,7 @@ int main()
>          assert(i == c.end());
>          assert(distance(c.begin(), c.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>          assert(*next(c.begin(), 3) == 2);
>          assert(distance(c.begin(), c.end()) == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(*next(c.begin(), 3) == 1);
>          assert(*next(c.begin(), 4) == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(*next(c.begin(), 3) == 1);
>          assert(*next(c.begin(), 4) == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          assert(*next(c.begin(), 3) == 2);
>          assert(distance(c.begin(), c.end()) == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef MoveOnly T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(*next(c.begin(), 3) == 3);
>          assert(*next(c.begin(), 4) == 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(distance(c.begin(), c.end()) == 0);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>          assert(*next(c.begin()) == 1);
>          assert(distance(c.begin(), c.end()) == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          assert(*next(c.begin()) == 1);
>          assert(distance(c.begin(), c.end()) == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef MoveOnly T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -64,7 +64,7 @@ int main()
>          assert(*next(c.begin(), 4) == 0);
>          assert(*next(c.begin(), 5) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef DefaultOnly T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>          C c3(std::begin(t3), std::end(t3));
>          assert(c1 == c3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          C c3(std::begin(t3), std::end(t3));
>          assert(c1 == c3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -103,7 +103,7 @@ int main()
>          }
>      assert ( it == c.end ());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -88,7 +88,7 @@ int main()
>          assert(c1 == c2);
>          assert(cp.count() == std::distance(std::begin(t1), std::end(t1)));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef unary_counting_predicate<bool(*)(T), T> Predicate;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>  {
>      for (int i = 0; i < 10; ++i)
>          test<std::forward_list<int> >(i);
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      for (int i = 0; i < 10; ++i)
>          test<std::forward_list<int, min_allocator<int>> >(i);
>  #endif
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ int main()
>  {
>      for (int i = 0; i < 40; ++i)
>          test<std::forward_list<int> >(i);
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      for (int i = 0; i < 40; ++i)
>          test<std::forward_list<int, min_allocator<int>> >(i);
>  #endif
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>  {
>      for (int i = 0; i < 40; ++i)
>          test<std::forward_list<int> >(i);
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      for (int i = 0; i < 40; ++i)
>          test<std::forward_list<int, min_allocator<int>> >(i);
>  #endif
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -55,7 +55,7 @@ int main()
>          }
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      // splicing different containers
>      typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -121,7 +121,7 @@ int main()
>          }
>      }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      // splicing different containers
>      typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -67,7 +67,7 @@ int main()
>          c1.unique();
>          assert(c1 == c2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -72,7 +72,7 @@ int main()
>          c1.unique(g);
>          assert(c1 == c2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -176,7 +176,7 @@ int main()
>          assert(distance(c2.begin(), c2.end()) == 0);
>          assert(c2.get_allocator() == A(1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef min_allocator<T> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -177,7 +177,7 @@ int main()
>          assert(distance(c2.begin(), c2.end()) == 0);
>          assert(c2.get_allocator() == A(1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef min_allocator<T> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/forwardlist/max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/forwardlist/max_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -24,7 +24,7 @@ int main()
>          C c;
>          assert(c.max_size() > 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::forward_list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/forwardlist/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/forwardlist/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/forwardlist/types.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>      static_assert((std::is_same<typename C::difference_type,
>          typename std::iterator_traits<typename
> C::const_iterator>::difference_type>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::forward_list<char, min_allocator<char>> C;
>      static_assert((std::is_same<C::value_type, char>::value), "");
>
> Modified: libcxx/trunk/test/std/containers/sequences/list/db_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/db_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/list/db_back.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/list/db_back.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      assert(c.back() == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::list<T, min_allocator<T>> C;
>
> Modified: libcxx/trunk/test/std/containers/sequences/list/db_cback.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/db_cback.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/list/db_cback.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/list/db_cback.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      assert(c.back() == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/db_cfront.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/db_cfront.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/list/db_cfront.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/list/db_cfront.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      assert(c.front() == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::list<T, min_allocator<T>> C;
>
> Modified: libcxx/trunk/test/std/containers/sequences/list/db_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/db_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/list/db_front.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/list/db_front.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      assert(c.front() == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_6.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/db_iterators_6.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_6.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_6.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>      --i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_7.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/db_iterators_7.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_7.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_7.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>      ++i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_8.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/db_iterators_8.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_8.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/db_iterators_8.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      T j = *i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/list/iterators.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/list/iterators.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -77,7 +77,7 @@ int main()
>          C::iterator i;
>          C::const_iterator j;
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::list<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(std::distance(l.begin(), l.end()) == 20);
>      }
>  #endif  // __LIBCPP_MOVE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l(5, 2);
>          l.resize(2);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>          assert(l.front() == 2);
>          assert(l.back() == 3.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<double, min_allocator<double>> l(5, 2);
>          l.resize(2, 3.5);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          assert(l2 == l);
>          assert(l2.get_allocator() == other_allocator<int>(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int> > l(3, 2, min_allocator<int>());
>          std::list<int, min_allocator<int> > l2(l, min_allocator<int>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      assert(*i++ == 5);
>      assert(*i++ == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<int, min_allocator<int>> d;
>      d.assign({3, 4, 5, 6});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -62,7 +62,7 @@ int main()
>          assert(l.empty());
>          assert(l2.get_allocator() == lo.get_allocator());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<MoveOnly, min_allocator<MoveOnly> >
> l(min_allocator<MoveOnly>{});
>          std::list<MoveOnly, min_allocator<MoveOnly> >
> lo(min_allocator<MoveOnly>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/copy.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>          assert(l2.get_allocator() == other_allocator<int>(-2));
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l(3, 2);
>          std::list<int, min_allocator<int>> l2 = l;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>          assert(l2 == l);
>          assert(l2.get_allocator() == other_allocator<int>(3));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int> > l(3, 2, min_allocator<int>());
>          std::list<int, min_allocator<int> > l2(l, min_allocator<int>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>          assert(l.size() == 0);
>          assert(std::distance(l.begin(), l.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l;
>          assert(l.size() == 0);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <list>
>  #include <cassert>
>
> @@ -29,7 +31,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::list<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -46,5 +47,4 @@ int main()
>          typedef std::list<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>          assert(l.size() == 0);
>          assert(std::distance(l.begin(), l.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l;
>          assert(l.size() == 0);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~list() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <list>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_alloc
>  {
> @@ -27,11 +27,8 @@ struct some_alloc
>      ~some_alloc() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::list<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -48,5 +45,4 @@ int main()
>          typedef std::list<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(*i++ == 5);
>      assert(*i++ == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<int, min_allocator<int>> d = {3, 4, 5, 6};
>      assert(d.size() == 4);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>      assert(*i++ == 5);
>      assert(*i++ == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<int, min_allocator<int>> d({3, 4, 5, 6},
> min_allocator<int>());
>      assert(d.get_allocator() == min_allocator<int>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -51,7 +51,7 @@ int main()
>          for (std::list<int>::const_iterator i = l.begin(), e = l.end(); i
> != e; ++i, ++j)
>              assert(*i == j);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int a[] = {0, 1, 2, 3};
>          std::list<int, min_allocator<int>> l(input_iterator<const
> int*>(a),
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(l.empty());
>          assert(l2.get_allocator() == lo.get_allocator());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<MoveOnly, min_allocator<MoveOnly> >
> l(min_allocator<MoveOnly>{});
>          std::list<MoveOnly, min_allocator<MoveOnly> >
> lo(min_allocator<MoveOnly>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(!l.empty());
>          assert(l2.get_allocator() == other_allocator<MoveOnly>(4));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<MoveOnly, min_allocator<MoveOnly> >
> l(min_allocator<MoveOnly>{});
>          std::list<MoveOnly, min_allocator<MoveOnly> >
> lo(min_allocator<MoveOnly>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,6 +16,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <list>
>  #include <cassert>
>
> @@ -31,7 +33,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::list<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -48,5 +49,4 @@ int main()
>          typedef std::list<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <list>
>  #include <cassert>
>
> @@ -29,7 +31,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::list<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -46,5 +47,4 @@ int main()
>          typedef std::list<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(*i++ == 5);
>      assert(*i++ == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<int, min_allocator<int>> d;
>      d = {3, 4, 5, 6};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/size_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/size_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/size_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/size_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -80,7 +80,7 @@ int main()
>          assert(std::distance(l.begin(), l.end()) == 3);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l(3);
>          assert(l.size() == 3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.cons/size_value_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          ++i;
>          assert(*i == 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l(3, 2);
>          assert(l.size() == 3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/clear.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -24,7 +24,7 @@ int main()
>      c.clear();
>      assert(c.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> c(a, a+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -60,7 +60,7 @@ int main()
>      }
>  #endif
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
>      {
>      std::list<A, min_allocator<A>> c;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>      assert(c.back().geti() == 3);
>      assert(c.back().getd() == 4.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<A, min_allocator<A>> c;
>      c.emplace_back(2, 3.5);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>      assert(c.back().geti() == 2);
>      assert(c.back().getd() == 3.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<A, min_allocator<A>> c;
>      c.emplace_front(2, 3.5);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>      assert(l1.size() == 0);
>      assert(distance(l1.begin(), l1.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      l1.erase(i);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      l1.erase(i);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>          assert(distance(l1.cbegin(), l1.cend()) == 0);
>          assert(i == l1.begin());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l1(a1, a1+3);
>          std::list<int, min_allocator<int>>::iterator i =
> l1.erase(l1.cbegin(), l1.cbegin());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      std::list<int>::iterator i = l1.erase(l2.cbegin(), next(l1.cbegin()));
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      std::list<int>::iterator i = l1.erase(l1.cbegin(), next(l2.cbegin()));
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      std::list<int>::iterator i = l1.erase(l2.cbegin(), next(l2.cbegin()));
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>      std::list<int>::iterator i = l1.erase(next(l1.cbegin()), l1.cbegin());
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ int main()
>      assert(*i++ == 1);
>      assert(*i++ == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<int, min_allocator<int>> d(10, 1);
>      std::list<int, min_allocator<int>>::iterator i =
> d.insert(next(d.cbegin(), 2), {3, 4, 5, 6});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -113,7 +113,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> l1;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
>      {
>      std::list<MoveOnly, min_allocator<MoveOnly>> l1;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -73,7 +73,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      int a2[] = {1, 4, 4, 4, 4, 4, 2, 3};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -76,7 +76,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      int a2[] = {1, 4, 2, 3};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -36,7 +36,7 @@ int main()
>          assert(false);
>  #endif
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> c(a, a+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/pop_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      c.pop_front();
>      assert(c.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a[] = {1, 2, 3};
>      std::list<int, min_allocator<int>> c(a, a+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      int a[] = {0, 1, 2, 3, 4};
>      assert(c == std::list<int>(a, a+5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<int, min_allocator<int>> c;
>      for (int i = 0; i < 5; ++i)
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>      assert(l1.front() == MoveOnly(1));
>      assert(l1.back() == MoveOnly(2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<MoveOnly, min_allocator<MoveOnly>> l1;
>      l1.push_back(MoveOnly(1));
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      int a[] = {4, 3, 2, 1, 0};
>      assert(c == std::list<int>(a, a+5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<int, min_allocator<int>> c;
>      for (int i = 0; i < 5; ++i)
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>      assert(l1.front() == MoveOnly(2));
>      assert(l1.back() == MoveOnly(1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::list<MoveOnly, min_allocator<MoveOnly>> l1;
>      l1.push_front(MoveOnly(1));
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/merge.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/merge.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/merge.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/merge.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -27,7 +27,7 @@ int main()
>      c1.merge(c2);
>      assert(c1 == std::list<int>(a3, a3+sizeof(a3)/sizeof(a3[0])));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 3, 7, 9, 10};
>      int a2[] = {0, 2, 4, 5, 6, 8, 11};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/merge_comp.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/merge_comp.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/merge_comp.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/merge_comp.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      c1.merge(c2, std::greater<int>());
>      assert(c1 == std::list<int>(a3, a3+sizeof(a3)/sizeof(a3[0])));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {10, 9, 7, 3, 1};
>      int a2[] = {11, 8, 6, 5, 4, 2, 0};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/remove.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/remove.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/remove.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/remove.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -57,7 +57,7 @@ int main()
>          }
>      assert ( it == c.end ());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3, 4};
>      int a2[] = {1, 2, 4};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/remove_if.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/remove_if.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/remove_if.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/remove_if.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>      assert(c == std::list<int>(a2, a2+2));
>      assert(cp.count() == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3, 4};
>      int a2[] = {3, 4};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/reverse.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/reverse.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/reverse.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/reverse.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      c1.reverse();
>      assert(c1 == std::list<int>(a2, a2+sizeof(a2)/sizeof(a2[0])));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
>      int a2[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/sort.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/sort.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/list/list.ops/sort.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/list/list.ops/sort.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      c1.sort();
>      assert(c1 == std::list<int>(a2, a2+sizeof(a2)/sizeof(a2[0])));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {4, 8, 1, 0, 5, 7, 2, 3, 6, 11, 10, 9};
>      int a2[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -26,7 +26,7 @@ int main()
>      c1.sort(std::greater<int>());
>      assert(c1 == std::list<int>(a2, a2+sizeof(a2)/sizeof(a2[0])));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {4, 8, 1, 0, 5, 7, 2, 3, 6, 11, 10, 9};
>      int a2[] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -411,7 +411,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l1;
>          std::list<int, min_allocator<int>> l2;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -188,7 +188,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l1;
>          std::list<int, min_allocator<int>> l2(a2, a2+1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -128,7 +128,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::list<int, min_allocator<int>> l1(a1, a1+3);
>          l1.splice(l1.begin(), l1, next(l1.begin()), next(l1.begin()));
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/unique.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/unique.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/unique.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/unique.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -25,7 +25,7 @@ int main()
>      c.unique();
>      assert(c == std::list<int>(a2, a2+4));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {2, 1, 1, 4, 4, 4, 4, 3, 3};
>      int a2[] = {2, 1, 4, 3};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.ops/unique_pred.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.ops/unique_pred.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.ops/unique_pred.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.ops/unique_pred.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>      c.unique(g);
>      assert(c == std::list<int>(a2, a2+4));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {2, 1, 1, 4, 4, 4, 4, 3, 3};
>      int a2[] = {2, 1, 4, 3};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/list/list.special/swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/list.special/swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/list/list.special/swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/list/list.special/swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>          assert((c2 == std::list<int, A>(a1,
> a1+sizeof(a1)/sizeof(a1[0]))));
>          assert(c2.get_allocator() == A(1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int a1[] = {1, 3, 7, 9, 10};
>          int a2[] = {0, 2, 4, 5, 6, 8, 11};
>
> Modified: libcxx/trunk/test/std/containers/sequences/list/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/list/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/list/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/list/types.pass.cpp Tue Jun
> 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          typename std::iterator_traits<typename
> C::const_iterator>::difference_type>::value), "");
>         }
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>         typedef std::list<int, min_allocator<int>> C;
>      static_assert((std::is_same<C::value_type, int>::value), "");
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/assign_copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          assert(l2 == l);
>          assert(l2.get_allocator() == other_allocator<bool>(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool> > l(3, true,
> min_allocator<bool>());
>          std::vector<bool, min_allocator<bool> > l2(l,
> min_allocator<bool>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/assign_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(d[2] == false);
>      assert(d[3] == true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<bool, min_allocator<bool>> d;
>      d.assign({true, false, false, true});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/assign_move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/assign_move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -61,7 +61,7 @@ int main()
>          assert(l.empty());
>          assert(l2.get_allocator() == lo.get_allocator());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool> > l(min_allocator<bool>{});
>          std::vector<bool, min_allocator<bool> > lo(min_allocator<bool>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/capacity.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/capacity.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/capacity.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/capacity.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>          v.push_back(0);
>          assert(v.capacity() >= 101);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v;
>          assert(v.capacity() == 0);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <vector>
>  #include <cassert>
>
> @@ -28,7 +30,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::vector<bool> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -45,5 +46,4 @@ int main()
>          typedef std::vector<bool, some_alloc<bool>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,13 +11,13 @@
>
>  // ~vector<bool>() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <vector>
>  #include <cassert>
>
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_alloc
>  {
> @@ -26,11 +26,8 @@ struct some_alloc
>      ~some_alloc() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::vector<bool> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -47,5 +44,4 @@ int main()
>          typedef std::vector<bool, some_alloc<bool>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ int main()
>      assert(l1.size() == 0);
>      assert(distance(l1.begin(), l1.end()) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<bool, min_allocator<bool>> l1(a1, a1+3);
>      std::vector<bool, min_allocator<bool>>::const_iterator i = l1.begin();
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>          assert(distance(l1.cbegin(), l1.cend()) == 0);
>          assert(i == l1.begin());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> l1(a1, a1+3);
>          std::vector<bool, min_allocator<bool>>::iterator i =
> l1.erase(l1.cbegin(), l1.cbegin());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -27,7 +27,7 @@ int main()
>      assert(d[2] == false);
>      assert(d[3] == true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<bool, min_allocator<bool>> d = {true, false, false, true};
>      assert(d.size() == 4);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>      assert(d[2] == false);
>      assert(d[3] == true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<bool, min_allocator<bool>> d({true, false, false, true},
> min_allocator<bool>());
>      assert(d.get_allocator() == min_allocator<bool>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>      assert(d[12] == true);
>      assert(d[13] == true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<bool, min_allocator<bool>> d(10, true);
>      std::vector<bool, min_allocator<bool>>::iterator i =
> d.insert(d.cbegin() + 2, {false, true, true, false});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -89,7 +89,7 @@ int main()
>          for (; j < v.size(); ++j)
>              assert(v[j] == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v(100);
>          bool a[] = {1, 0, 0, 1, 1};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -63,7 +63,7 @@ int main()
>          for (++j; j < v.size(); ++j)
>              assert(v[j] == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v(100);
>          std::vector<bool, min_allocator<bool>>::iterator i =
> v.insert(v.cbegin() + 10, 5, 1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/insert_iter_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -60,7 +60,7 @@ int main()
>          for (++j; j < v.size(); ++j)
>              assert(v[j] == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v(100);
>          std::vector<bool, min_allocator<bool>>::iterator i =
> v.insert(v.cbegin() + 10, 1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/iterators.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -58,7 +58,7 @@ int main()
>          C::iterator i;
>          C::const_iterator j;
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef bool T;
>          typedef std::vector<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/vector.bool/move.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/vector.bool/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(l.empty());
>          assert(l2.get_allocator() == lo.get_allocator());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool> > l(min_allocator<bool>{});
>          std::vector<bool, min_allocator<bool> > lo(min_allocator<bool>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -58,7 +58,7 @@ int main()
>          assert(!l.empty());
>          assert(l2.get_allocator() == other_allocator<bool>(4));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool> > l(min_allocator<bool>{});
>          std::vector<bool, min_allocator<bool> > lo(min_allocator<bool>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,6 +16,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <vector>
>  #include <cassert>
>
> @@ -56,7 +58,6 @@ struct some_alloc3
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::vector<bool> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -87,6 +88,4 @@ int main()
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
>  #endif
> -
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <vector>
>  #include <cassert>
>
> @@ -28,7 +30,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::vector<bool> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -50,5 +51,4 @@ int main()
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>  #endif
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(d[2] == false);
>      assert(d[3] == true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<bool, min_allocator<bool>> d;
>      d = {true, false, false, true};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/push_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/push_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/push_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/push_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>                  assert(c[j] == a[j]);
>          }
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          bool a[] = {0, 1, 1, 0, 1, 0, 0};
>          const unsigned N = sizeof(a)/sizeof(a[0]);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/reference.swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/reference.swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/reference.swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/reference.swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <vector>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>
> @@ -25,7 +27,7 @@ int main()
>         std::vector<bool>::reference r1 = v[0];
>         std::vector<bool>::reference r2 = v[3];
>
> -#if __has_feature(cxx_noexcept)
> +#if TEST_STD_VER >= 11
>      static_assert((noexcept(v.swap(r1,r2))), "");
>  #endif
>
> @@ -34,4 +36,4 @@ int main()
>         v.swap(r1, r2);
>         assert( r1);
>         assert(!r2);
> -}
> \ No newline at end of file
> +}
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/reserve.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/reserve.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/reserve.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/reserve.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>          assert(v.size() == 100);
>          assert(v.capacity() >= 150);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v;
>          v.reserve(10);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          assert(v.size() == 300);
>          assert(v.capacity() >= 400);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v(100);
>          v.resize(50);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/resize_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>          for (unsigned i = 50; i < 200; ++i)
>              assert(v[i] == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v(100);
>          v.resize(50, 1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -26,7 +26,7 @@ int main()
>          assert(v.capacity() >= 101);
>          assert(v.size() >= 101);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v(100);
>          v.push_back(1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/vector.bool/swap.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/vector.bool/swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -62,7 +62,7 @@ int main()
>          assert(v[0] == false);
>          assert(v[1] == true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<bool, min_allocator<bool>> v1(100);
>          std::vector<bool, min_allocator<bool>> v2(200);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/vector.bool/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/vector.bool/types.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -74,7 +74,7 @@ int main()
>      test<std::allocator<bool> >();
>      static_assert((std::is_same<std::vector<bool>::allocator_type,
>                                  std::allocator<bool> >::value), "");
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test<min_allocator<bool> >();
>  #endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -37,7 +37,7 @@ int main()
>      H h;
>      assert(h(vb) != 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::vector<bool, min_allocator<bool>> T;
>      typedef std::hash<T> H;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/contiguous.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/contiguous.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/vector/contiguous.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/vector/contiguous.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ int main()
>      test_contiguous(C(A(3)));
>      test_contiguous(C(7, 9.0, A(5)));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef double T;
>      typedef min_allocator<T> A;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/vector/iterators.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/vector/iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -77,7 +77,7 @@ int main()
>          C::iterator i;
>          C::const_iterator j;
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int T;
>          typedef std::vector<T, min_allocator<T>> C;
>
> Modified: libcxx/trunk/test/std/containers/sequences/vector/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/sequences/vector/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/sequences/vector/types.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>      test<Copyable, test_allocator<Copyable> >();
>      static_assert((std::is_same<std::vector<char>::allocator_type,
>                                  std::allocator<char> >::value), "");
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>
>      typedef std::vector<int, min_allocator<int> > C;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/capacity.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/capacity.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/capacity.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/capacity.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>          assert(v.capacity() > 101);
>          assert(is_contiguous_container_asan_correct(v));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v;
>          assert(v.capacity() == 0);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/reserve.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/reserve.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/reserve.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/reserve.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(v.capacity() == 150);
>          assert(is_contiguous_container_asan_correct(v));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v;
>          v.reserve(10);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -67,7 +67,7 @@ int main()
>          assert(is_contiguous_container_asan_correct(v));
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<MoveOnly, min_allocator<MoveOnly>> v(100);
>          v.resize(50);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(v.capacity() >= 200);
>          assert(is_contiguous_container_asan_correct(v));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v(100);
>          v.resize(50, 1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(is_contiguous_container_asan_correct(v));
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v(100);
>          v.push_back(1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.capacity/swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          assert(v2.capacity() == 100);
>          assert(is_contiguous_container_asan_correct(v2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v1(100);
>          std::vector<int, min_allocator<int>> v2(200);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>          assert(l2 == l);
>          assert(l2.get_allocator() == other_allocator<int>(5));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int> > l(3, 2,
> min_allocator<int>());
>          std::vector<int, min_allocator<int> > l2(l, min_allocator<int>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>      test(d2);
>      }
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::vector<int, min_allocator<int>> V;
>      V d1;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -76,7 +76,7 @@ int main()
>          assert(l2.get_allocator() == lo.get_allocator());
>          assert(is_contiguous_container_asan_correct(l2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<MoveOnly, min_allocator<MoveOnly> >
> l(min_allocator<MoveOnly>{});
>          std::vector<MoveOnly, min_allocator<MoveOnly> >
> lo(min_allocator<MoveOnly>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/assign_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>      test(d2);
>      }
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::vector<int, min_allocator<int>> V;
>      V d1;
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <vector>
>  #include <cassert>
>
> @@ -30,7 +32,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::vector<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -47,5 +48,4 @@ int main()
>          typedef std::vector<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~vector() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <vector>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_alloc
>  {
> @@ -27,11 +27,8 @@ struct some_alloc
>      ~some_alloc() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::vector<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -48,5 +45,4 @@ int main()
>          typedef std::vector<MoveOnly, some_alloc<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -28,7 +28,7 @@ int main()
>      assert(d[2] == 5);
>      assert(d[3] == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<int, min_allocator<int>> d = {3, 4, 5, 6};
>      assert(d.size() == 4);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      assert(d[2] == 5);
>      assert(d[3] == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<int, min_allocator<int>> d({3, 4, 5, 6},
> min_allocator<int>());
>      assert(d.get_allocator() == min_allocator<int>());
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(*j == 3);
>          assert(is_contiguous_container_asan_correct(c2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<MoveOnly, min_allocator<MoveOnly> >
> l(min_allocator<MoveOnly>{});
>          std::vector<MoveOnly, min_allocator<MoveOnly> >
> lo(min_allocator<MoveOnly>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -75,7 +75,7 @@ int main()
>          assert(l2.get_allocator() == other_allocator<MoveOnly>(4));
>          assert(is_contiguous_container_asan_correct(l2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<MoveOnly, min_allocator<MoveOnly> >
> l(min_allocator<MoveOnly>{});
>          std::vector<MoveOnly, min_allocator<MoveOnly> >
> lo(min_allocator<MoveOnly>{});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,6 +16,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <vector>
>  #include <cassert>
>
> @@ -58,7 +60,6 @@ struct some_alloc3
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::vector<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -91,6 +92,4 @@ int main()
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
>  #endif
> -
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <vector>
>  #include <cassert>
>
> @@ -29,7 +31,6 @@ struct some_alloc
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::vector<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -51,5 +52,4 @@ int main()
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>  #endif
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>      assert(d[2] == 5);
>      assert(d[3] == 6);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<int, min_allocator<int>> d;
>      d = {3, 4, 5, 6};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.data/data.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.data/data.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.data/data.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.data/data.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>          assert(v.data() == &v.front());
>          assert(is_contiguous_container_asan_correct(v));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v;
>          assert(v.data() == 0);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.data/data_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -29,7 +29,7 @@ int main()
>          assert(v.data() == &v.front());
>          assert(is_contiguous_container_asan_correct(v));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          const std::vector<int, min_allocator<int>> v;
>          assert(v.data() == 0);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -122,7 +122,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<A, min_allocator<A>> c;
>          std::vector<A, min_allocator<A>>::iterator i =
> c.emplace(c.cbegin(), 2, 3.5);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -86,7 +86,7 @@ int main()
>          assert(c.back().getd() == 4.5);
>          assert(is_contiguous_container_asan_correct(c));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<A, min_allocator<A>> c;
>          c.emplace_back(2, 3.5);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>          assert(v[0] == 3);
>          assert(is_contiguous_container_asan_correct(v));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v;
>          v.reserve(3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      assert(distance(l1.begin(), l1.end()) == 0);
>      assert(is_contiguous_container_asan_correct(l1));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::vector<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      l1.erase(i);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::vector<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      l1.erase(i);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::vector<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -72,7 +72,7 @@ int main()
>          assert(is_contiguous_container_asan_correct(outer[0]));
>          assert(is_contiguous_container_asan_correct(outer[1]));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> l1(a1, a1+3);
>          assert(is_contiguous_container_asan_correct(l1));
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      std::vector<int>::iterator i = l1.erase(l2.cbegin(), l1.cbegin()+1);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::vector<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      std::vector<int>::iterator i = l1.erase(l1.cbegin(), l2.cbegin()+1);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::vector<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      std::vector<int>::iterator i = l1.erase(l2.cbegin(), l2.cbegin()+1);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::vector<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>      std::vector<int>::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin());
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      int a1[] = {1, 2, 3};
>      std::vector<int, min_allocator<int>> l1(a1, a1+3);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>      assert(d[12] == 1);
>      assert(d[13] == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      std::vector<int, min_allocator<int>> d(10, 1);
>      std::vector<int, min_allocator<int>>::iterator i =
> d.insert(d.cbegin() + 2, {3, 4, 5, 6});
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -140,7 +140,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v(100);
>          int a[] = {1, 2, 3, 4, 5};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<MoveOnly, min_allocator<MoveOnly>> v(100);
>          std::vector<MoveOnly, min_allocator<MoveOnly>>::iterator i =
> v.insert(v.cbegin() + 10, MoveOnly(3));
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -91,7 +91,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v(100);
>          std::vector<int, min_allocator<int>>::iterator i =
> v.insert(v.cbegin() + 10, 5, 1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -89,7 +89,7 @@ int main()
>          assert(false);
>      }
>  #endif
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> v(100);
>          std::vector<int, min_allocator<int>>::iterator i =
> v.insert(v.cbegin() + 10, 1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>          assert(false);
>  #endif
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> c;
>          c.push_back(1);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -75,7 +75,7 @@ int main()
>          for (int j = 0; j < c.size(); ++j)
>              assert(c[j] == j);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<int, min_allocator<int>> c;
>          c.push_back(0);
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -77,7 +77,7 @@ int main()
>          for (int j = 0; j < c.size(); ++j)
>              assert(c[j] == MoveOnly(j));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::vector<MoveOnly, min_allocator<MoveOnly>> c;
>          c.push_back(MoveOnly(0));
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.special/db_swap_1.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -37,7 +37,7 @@ int main()
>          c1.erase(i1);
>          assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int a1[] = {1, 3, 7, 9, 10};
>          int a2[] = {0, 2, 4, 5, 6, 8, 11};
>
> Modified:
> libcxx/trunk/test/std/containers/sequences/vector/vector.special/swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/vector/vector.special/swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/sequences/vector/vector.special/swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/sequences/vector/vector.special/swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -108,7 +108,7 @@ int main()
>          assert(is_contiguous_container_asan_correct(c1));
>          assert(is_contiguous_container_asan_correct(c2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          int a1[] = {1, 3, 7, 9, 10};
>          int a2[] = {0, 2, 4, 5, 6, 8, 11};
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.map/bucket.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/bucket.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/bucket.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/bucket.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          for (size_t i = 0; i < 13; ++i)
>              assert(c.bucket(i) == i % bc);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/bucket_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/bucket_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/bucket_size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/bucket_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(c.bucket_size(3) == 1);
>          assert(c.bucket_size(4) == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.map/count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/count.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/count.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>          assert(c.count(30) == 1);
>          assert(c.count(5) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.map/eq.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/eq.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/eq.pass.cpp (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/eq.pass.cpp Tue Jun
> 14 16:31:42 2016
> @@ -91,7 +91,7 @@ int main()
>          assert( (c1 == c2));
>          assert(!(c1 != c2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/equal_range_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/equal_range_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/equal_range_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/equal_range_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          r = c.equal_range(5);
>          assert(std::distance(r.first, r.second) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/equal_range_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/equal_range_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/equal_range_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/equal_range_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          r = c.equal_range(5);
>          assert(std::distance(r.first, r.second) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/find_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/find_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/find_const.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/find_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          i = c.find(5);
>          assert(i == c.cend());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/find_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/find_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/find_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/find_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          i = c.find(5);
>          assert(i == c.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/iterators.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -66,7 +66,7 @@ int main()
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>          C::const_iterator i;
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/local_iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/local_iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/local_iterators.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/local_iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -220,7 +220,7 @@ int main()
>          assert(i->first == 4);
>          assert(i->second == "four");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/max_size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/max_size.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -26,7 +26,7 @@ int main()
>          std::unordered_map<int, int> u;
>          assert(u.max_size() > 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::unordered_map<int, int, std::hash<int>, std::equal_to<int>,
>                                      min_allocator<std::pair<const int,
> int>>> u;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.map/rehash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/rehash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/rehash.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/rehash.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(c.bucket_count() == 31);
>          test(c);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.map/reserve.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/reserve.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/reserve.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/reserve.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -74,7 +74,7 @@ int main()
>          assert(c.bucket_count() >= 16);
>          test(c);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.map/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.map/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.map/types.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>          static_assert((std::is_same<C::size_type, std::size_t>::value),
> "");
>          static_assert((std::is_same<C::difference_type,
> std::ptrdiff_t>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<char, short, std::hash<char>,
> std::equal_to<char>,
>                              min_allocator<std::pair<const char, short>>>
> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<NotConstructible, NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -135,7 +135,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<std::pair<const int, std::string> > A;
>          typedef std::unordered_map<int, std::string,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<std::pair<const int, std::string> > A;
>          typedef std::unordered_map<int, std::string,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -165,7 +165,7 @@ int main()
>          assert(c.max_load_factor() == 1);
>          assert(c0.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<std::pair<const int, std::string> > A;
>          typedef std::unordered_map<int, std::string,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -108,7 +108,7 @@ int main()
>          assert(c.max_load_factor() == 1);
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -67,7 +67,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<NotConstructible, NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_map>
>  #include <cassert>
>
> @@ -43,7 +45,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_map<MoveOnly, MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -67,5 +68,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~unordered_map() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_map>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_comp
>  {
> @@ -36,11 +36,8 @@ struct some_hash
>      ~some_hash() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_map<MoveOnly, MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -64,5 +61,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -62,7 +62,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -63,7 +63,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -66,7 +66,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -111,7 +111,7 @@ int main()
>
>          assert(c0.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<int, std::string> P;
>          typedef min_allocator<std::pair<const int, std::string>> A;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_map>
>  #include <cassert>
>
> @@ -42,7 +44,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_map<MoveOnly, MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -66,5 +67,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_map>
>  #include <cassert>
>
> @@ -39,7 +41,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_map<MoveOnly, MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -63,5 +64,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -63,7 +63,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -66,7 +66,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -69,7 +69,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -71,7 +71,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<NotConstructible, NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<NotConstructible, NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<NotConstructible, NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<NotConstructible, NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<NotConstructible, NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -77,7 +77,7 @@ int main()
>          }
>          assert(c.size() == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/clear.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>          c.clear();
>          assert(c.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>          assert(r.first->first == 5);
>          assert(r.first->second == Emplaceable(6, 7));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, Emplaceable, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> Emplaceable>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace_hint.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace_hint.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace_hint.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/emplace_hint.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -51,7 +51,7 @@ int main()
>          assert(r->first == 5);
>          assert(r->second == Emplaceable(6, 7));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, Emplaceable, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> Emplaceable>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/erase_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/erase_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/erase_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/erase_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -58,7 +58,7 @@ int main()
>          assert(c.size() == 0);
>          assert(k == c.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_hint_const_lvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_hint_const_lvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_hint_const_lvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_hint_const_lvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          assert(r->first == 5.5);
>          assert(r->second == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<double, int, std::hash<double>,
> std::equal_to<double>,
>                              min_allocator<std::pair<const double, int>>>
> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.at(3) == "three");
>          assert(c.at(4) == "four");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.at(3) == "three");
>          assert(c.at(4) == "four");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_map<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/bucket.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/bucket.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multimap/bucket.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multimap/bucket.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          for (size_t i = 0; i < 13; ++i)
>              assert(c.bucket(i) == i % bc);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/bucket_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>          assert(c.bucket_size(5) == 0);
>          assert(c.bucket_size(6) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multimap/count.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multimap/count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(c.count(50) == 3);
>          assert(c.count(5) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_7.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_7.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_7.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_7.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -36,7 +36,7 @@ int main()
>      ++i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                          min_allocator<std::pair<const int, std::string>>>
> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_8.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_8.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_8.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_iterators_8.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      C::value_type j = *i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                          min_allocator<std::pair<const int, std::string>>>
> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      ++i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                          min_allocator<std::pair<const int, std::string>>>
> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      C::value_type j = *i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                          min_allocator<std::pair<const int, std::string>>>
> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.multimap/eq.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/eq.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multimap/eq.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multimap/eq.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -100,7 +100,7 @@ int main()
>          assert( (c1 == c2));
>          assert(!(c1 != c2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -57,7 +57,7 @@ int main()
>          assert(r.first->first == 50);
>          assert(r.first->second == "fiftyB");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/equal_range_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -57,7 +57,7 @@ int main()
>          assert(r.first->first == 50);
>          assert(r.first->second == "fiftyB");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/find_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/find_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/find_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/find_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          i = c.find(5);
>          assert(i == c.cend());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/find_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/find_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/find_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/find_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          i = c.find(5);
>          assert(i == c.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/iterators.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -69,7 +69,7 @@ int main()
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>          C::const_iterator i;
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/load_factor.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/load_factor.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/load_factor.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/load_factor.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          const C c;
>          assert(c.load_factor() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/local_iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/local_iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/local_iterators.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/local_iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -284,7 +284,7 @@ int main()
>          j = c.cend(b);
>          assert(std::distance(i, j) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_bucket_count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/max_bucket_count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_bucket_count.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_bucket_count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ int main()
>          const C c;
>          assert(c.max_bucket_count() > 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_load_factor.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/max_load_factor.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_load_factor.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_load_factor.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>          c.max_load_factor(2.5);
>          assert(c.max_load_factor() == 2.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/max_size.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -26,7 +26,7 @@ int main()
>          std::unordered_multimap<int, int> u;
>          assert(u.max_size() > 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::unordered_multimap<int, int, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int, int>>> u;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/rehash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/rehash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multimap/rehash.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multimap/rehash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -97,7 +97,7 @@ int main()
>          assert(c.bucket_count() == 31);
>          test(c);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/reserve.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/reserve.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multimap/reserve.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multimap/reserve.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -76,7 +76,7 @@ int main()
>          assert(c.bucket_count() >= 16);
>          test(c);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/swap_member.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/swap_member.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/swap_member.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/swap_member.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -396,7 +396,7 @@ int main()
>          assert(std::distance(c2.cbegin(), c2.cend()) == c2.size());
>          assert(c2.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_hash<std::hash<int> > Hash;
>          typedef test_compare<std::equal_to<int> > Compare;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multimap/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multimap/types.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -50,7 +50,7 @@ int main()
>          static_assert((std::is_same<C::size_type, std::size_t>::value),
> "");
>          static_assert((std::is_same<C::difference_type,
> std::ptrdiff_t>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<char, short, std::hash<char>,
> std::equal_to<char>,
>                              min_allocator<std::pair<const char, short>>>
> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<NotConstructible,
> NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -163,7 +163,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<std::pair<const int, std::string> > A;
>          typedef std::unordered_multimap<int, std::string,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -84,7 +84,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<std::pair<const int, std::string> > A;
>          typedef std::unordered_multimap<int, std::string,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -223,7 +223,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<std::pair<const int, std::string> > A;
>          typedef std::unordered_multimap<int, std::string,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -136,7 +136,7 @@ int main()
>          assert(c.max_load_factor() == 1);
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -81,7 +81,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<NotConstructible,
> NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_map>
>  #include <cassert>
>
> @@ -43,7 +45,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_multimap<MoveOnly, MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -67,5 +68,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~unordered_multimap() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_map>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_comp
>  {
> @@ -36,11 +36,8 @@ struct some_hash
>      ~some_hash() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_multimap<MoveOnly, MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -64,5 +61,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -81,7 +81,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >());
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >()));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -84,7 +84,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >());
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >()));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -85,7 +85,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >());
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >()));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -87,7 +87,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >(9));
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >()));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -88,7 +88,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >(9));
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >(10)));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -128,7 +128,7 @@ int main()
>
>          assert(c0.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -159,7 +159,7 @@ int main()
>
>          assert(c0.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::pair<int, std::string> P;
>          typedef min_allocator<std::pair<const int, std::string>> A;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_map>
>  #include <cassert>
>
> @@ -42,7 +44,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_multimap<MoveOnly, MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -66,5 +67,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_map>
>  #include <cassert>
>
> @@ -39,7 +41,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_multimap<MoveOnly, MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -63,5 +64,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -85,7 +85,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >());
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >()));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -88,7 +88,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >());
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >()));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -90,7 +90,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >());
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >()));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -91,7 +91,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >(9));
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >()));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -93,7 +93,7 @@ int main()
>          assert(c.key_eq() == test_compare<std::equal_to<int> >(9));
>          assert((c.get_allocator() == test_allocator<std::pair<const int,
> std::string> >(10)));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<NotConstructible,
> NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<NotConstructible,
> NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<NotConstructible,
> NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<NotConstructible,
> NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<NotConstructible,
> NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>          c.clear();
>          assert(c.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(r->first == 5);
>          assert(r->second == Emplaceable(6, 7));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, Emplaceable, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> Emplaceable>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(r->first == 3);
>          assert(r->second == Emplaceable(5, 6));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, Emplaceable, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> Emplaceable>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -76,7 +76,7 @@ int main()
>          assert(std::distance(c.begin(), c.end()) == c.size());
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
> @@ -123,7 +123,7 @@ int main()
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>      }
>  #endif
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      {
>      //  This is LWG #2059
>          typedef TemplateConstructor T;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -21,7 +21,7 @@
>
>  #include "min_allocator.h"
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  template <typename Unordered>
>  bool only_deletions ( const Unordered &whole, const Unordered &part ) {
>      typename Unordered::const_iterator w = whole.begin();
> @@ -200,7 +200,7 @@ int main()
>          assert(std::distance(c.begin(), c.end()) == c.size());
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -98,7 +98,7 @@ int main()
>          assert(c.size() == 0);
>          assert(k == c.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(r->first == 5.5);
>          assert(r->second == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<double, int, std::hash<double>,
> std::equal_to<double>,
>                              min_allocator<std::pair<const double, int>>>
> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          assert(r->first == 5.5);
>          assert(r->second == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<double, int, std::hash<double>,
> std::equal_to<double>,
>                              min_allocator<std::pair<const double, int>>>
> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -70,7 +70,7 @@ int main()
>          assert(std::distance(c.begin(), c.end()) == c.size());
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -70,7 +70,7 @@ int main()
>          assert(std::distance(c.begin(), c.end()) == c.size());
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multimap<int, std::string, std::hash<int>,
> std::equal_to<int>,
>                              min_allocator<std::pair<const int,
> std::string>>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -395,7 +395,7 @@ int main()
>          assert(std::distance(c2.cbegin(), c2.cend()) == c2.size());
>          assert(c2.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_hash<std::hash<int> > Hash;
>          typedef test_compare<std::equal_to<int> > Compare;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/bucket.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multiset/bucket.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multiset/bucket.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          for (size_t i = 0; i < 13; ++i)
>              assert(c.bucket(i) == i % bc);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          const C c(std::begin(a), std::end(a));
>          assert(c.bucket_count() >= 11);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/bucket_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(c.bucket_size(5) == 0);
>          assert(c.bucket_size(6) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multiset/clear.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multiset/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>          c.clear();
>          assert(c.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multiset/count.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multiset/count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.count(50) == 3);
>          assert(c.count(5) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>      ++i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::unordered_multiset<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      T j = *i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::unordered_multiset<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      ++i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::unordered_multiset<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      T j = *i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::unordered_multiset<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multiset/emplace.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multiset/emplace.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>          assert(c.size() == 3);
>          assert(*r == Emplaceable(5, 6));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<Emplaceable,
> std::hash<Emplaceable>,
>                        std::equal_to<Emplaceable>,
> min_allocator<Emplaceable>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/emplace_hint.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/emplace_hint.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/emplace_hint.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/emplace_hint.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(c.size() == 3);
>          assert(*r == Emplaceable(5, 6));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<Emplaceable,
> std::hash<Emplaceable>,
>                        std::equal_to<Emplaceable>,
> min_allocator<Emplaceable>> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.multiset/eq.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/eq.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multiset/eq.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multiset/eq.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -99,7 +99,7 @@ int main()
>          assert( (c1 == c2));
>          assert(!(c1 != c2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -53,7 +53,7 @@ int main()
>          ++r.first;
>          assert(*r.first == 50);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/equal_range_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -53,7 +53,7 @@ int main()
>          ++r.first;
>          assert(*r.first == 50);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_const_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/erase_const_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_const_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_const_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          assert(c.count(3) == 1);
>          assert(c.count(4) == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
> @@ -76,7 +76,7 @@ int main()
>          assert(c.count(4) == 1);
>      }
>  #endif
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      {
>      //  This is LWG #2059
>          typedef TemplateConstructor T;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_key.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/erase_key.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_key.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_key.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -21,7 +21,7 @@
>
>  #include "min_allocator.h"
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  template <typename Unordered>
>  bool only_deletions ( const Unordered &whole, const Unordered &part ) {
>      typename Unordered::const_iterator w = whole.begin();
> @@ -95,7 +95,7 @@ int main()
>          assert(c.erase(3) == 0);
>          assert(c.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/erase_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/erase_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -55,7 +55,7 @@ int main()
>          assert(c.size() == 0);
>          assert(k == c.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/find_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/find_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/find_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/find_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>          i = c.find(5);
>          assert(i == c.cend());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/find_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/find_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/find_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/find_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>          i = c.find(5);
>          assert(i == c.cend());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.size() == 4);
>          assert(*r == 5.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<double, std::hash<double>,
>                                  std::equal_to<double>,
> min_allocator<double>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(c.size() == 4);
>          assert(*r == 5.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<double, std::hash<double>,
>                                  std::equal_to<double>,
> min_allocator<double>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -73,7 +73,7 @@ int main()
>          assert(*r == 5);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<double, std::hash<double>,
>                                  std::equal_to<double>,
> min_allocator<double>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/insert_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(c.count(3) == 1);
>          assert(c.count(4) == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/insert_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(c.count(3) == 1);
>          assert(c.count(4) == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -67,7 +67,7 @@ int main()
>          assert(*r == 5);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<double, std::hash<double>,
>                                  std::equal_to<double>,
> min_allocator<double>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/iterators.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>          C::const_iterator i;
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/load_factor.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/load_factor.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/load_factor.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/load_factor.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          const C c;
>          assert(c.load_factor() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/local_iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/local_iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/local_iterators.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/local_iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -259,7 +259,7 @@ int main()
>          j = c.cend(b);
>          assert(std::distance(i, j) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_bucket_count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/max_bucket_count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_bucket_count.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_bucket_count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -27,7 +27,7 @@ int main()
>          const C c;
>          assert(c.max_bucket_count() > 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_load_factor.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/max_load_factor.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_load_factor.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_load_factor.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>          c.max_load_factor(2.5);
>          assert(c.max_load_factor() == 2.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/max_size.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -26,7 +26,7 @@ int main()
>          std::unordered_multiset<int> u;
>          assert(u.max_size() > 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> u;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/rehash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/rehash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multiset/rehash.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multiset/rehash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -67,7 +67,7 @@ int main()
>          assert(c.bucket_count() == 31);
>          test(c);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/reserve.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/reserve.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multiset/reserve.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multiset/reserve.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -73,7 +73,7 @@ int main()
>          assert(c.bucket_count() >= 16);
>          test(c);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/swap_member.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/swap_member.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/swap_member.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/swap_member.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -386,7 +386,7 @@ int main()
>          assert(std::distance(c2.cbegin(), c2.cend()) == c2.size());
>          assert(c2.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_hash<std::hash<int> > Hash;
>          typedef test_compare<std::equal_to<int> > Compare;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.multiset/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.multiset/types.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          static_assert((std::is_same<C::size_type, std::size_t>::value),
> "");
>          static_assert((std::is_same<C::difference_type,
> std::ptrdiff_t>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<short, std::hash<short>,
>                                    std::equal_to<short>,
> min_allocator<short>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -151,7 +151,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<int> A;
>          typedef std::unordered_multiset<int,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<int> A;
>          typedef std::unordered_multiset<int,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -170,7 +170,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_allocator<int> A;
>          typedef std::unordered_multiset<int,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -121,7 +121,7 @@ int main()
>          assert(c.max_load_factor() == 1);
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -73,7 +73,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_set>
>  #include <cassert>
>
> @@ -43,7 +45,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_multiset<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -67,5 +68,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~unordered_multiset() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_set>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_comp
>  {
> @@ -36,11 +36,8 @@ struct some_hash
>      ~some_hash() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_multiset<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -64,5 +61,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -57,7 +57,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -60,7 +60,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -62,7 +62,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -63,7 +63,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -64,7 +64,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -103,7 +103,7 @@ int main()
>
>          assert(c0.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -118,7 +118,7 @@ int main()
>
>          assert(c0.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int P;
>          typedef min_allocator<int> A;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_set>
>  #include <cassert>
>
> @@ -42,7 +44,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_multiset<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -66,5 +67,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_set>
>  #include <cassert>
>
> @@ -39,7 +41,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_multiset<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -63,5 +64,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -60,7 +60,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -63,7 +63,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -66,7 +66,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_multiset<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -386,7 +386,7 @@ int main()
>          assert(std::distance(c2.cbegin(), c2.cend()) == c2.size());
>          assert(c2.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_hash<std::hash<int> > Hash;
>          typedef test_compare<std::equal_to<int> > Compare;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.set/bucket.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/bucket.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/bucket.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/bucket.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          for (size_t i = 0; i < 13; ++i)
>              assert(c.bucket(i) == i % bc);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/bucket_count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/bucket_count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/bucket_count.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/bucket_count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          const C c(std::begin(a), std::end(a));
>          assert(c.bucket_count() >= 11);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef C::const_iterator I;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/bucket_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/bucket_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/bucket_size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/bucket_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(c.bucket_size(3) == 1);
>          assert(c.bucket_size(4) == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.set/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/clear.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/clear.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>          c.clear();
>          assert(c.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.set/count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/count.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/count.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.count(50) == 1);
>          assert(c.count(5) == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_7.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>      ++i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::unordered_set<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/db_iterators_8.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      T j = *i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::unordered_set<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      ++i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::unordered_set<T, min_allocator<T>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      T j = *i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef int T;
>      typedef std::unordered_set<T, min_allocator<T>> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.set/emplace.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/emplace.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/emplace.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/emplace.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(*r.first == Emplaceable(5, 6));
>          assert(!r.second);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<Emplaceable, std::hash<Emplaceable>,
>                        std::equal_to<Emplaceable>,
> min_allocator<Emplaceable>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/emplace_hint.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/emplace_hint.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/emplace_hint.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/emplace_hint.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(c.size() == 2);
>          assert(*r == Emplaceable(5, 6));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<Emplaceable, std::hash<Emplaceable>,
>                        std::equal_to<Emplaceable>,
> min_allocator<Emplaceable>> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.set/eq.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/eq.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/eq.pass.cpp (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/eq.pass.cpp Tue Jun
> 14 16:31:42 2016
> @@ -90,7 +90,7 @@ int main()
>          assert( (c1 == c2));
>          assert(!(c1 != c2));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/equal_range_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/equal_range_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/equal_range_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/equal_range_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>          assert(std::distance(r.first, r.second) == 1);
>          assert(*r.first == 50);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef C::const_iterator I;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/equal_range_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/equal_range_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/equal_range_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/equal_range_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>          assert(std::distance(r.first, r.second) == 1);
>          assert(*r.first == 50);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef C::iterator I;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/erase_const_iter.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/erase_const_iter.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/erase_const_iter.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/erase_const_iter.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -51,7 +51,7 @@ int main()
>          assert(c.count(3) == 1);
>          assert(c.count(4) == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
> @@ -73,7 +73,7 @@ int main()
>          assert(c.count(4) == 1);
>      }
>  #endif
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      {
>      //  This is LWG #2059
>          typedef TemplateConstructor T;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/erase_key.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/erase_key.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/erase_key.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/erase_key.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -21,7 +21,7 @@
>
>  #include "min_allocator.h"
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  template <typename Unordered>
>  bool only_deletions ( const Unordered &whole, const Unordered &part ) {
>      typename Unordered::const_iterator w = whole.begin();
> @@ -95,7 +95,7 @@ int main()
>          assert(c.erase(3) == 0);
>          assert(c.size() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/erase_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/erase_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/erase_range.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/erase_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -55,7 +55,7 @@ int main()
>          assert(c.size() == 0);
>          assert(k == c.end());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/find_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/find_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/find_const.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/find_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>          i = c.find(5);
>          assert(i == c.cend());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/find_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/find_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/find_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/find_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -42,7 +42,7 @@ int main()
>          i = c.find(5);
>          assert(i == c.cend());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
> std::equal_to<int>, min_allocator<int>> C;
>          typedef int P;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/insert_const_lvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/insert_const_lvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/insert_const_lvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/insert_const_lvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(*r.first == 5.5);
>          assert(r.second);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<double, std::hash<double>,
>                                  std::equal_to<double>,
> min_allocator<double>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(c.size() == 3);
>          assert(*r == 5.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<double, std::hash<double>,
>                                  std::equal_to<double>,
> min_allocator<double>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -73,7 +73,7 @@ int main()
>          assert(*r == 5);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<double, std::hash<double>,
>                                  std::equal_to<double>,
> min_allocator<double>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/insert_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/insert_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/insert_init.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/insert_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(c.count(3) == 1);
>          assert(c.count(4) == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/insert_range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/insert_range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/insert_range.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/insert_range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -44,7 +44,7 @@ int main()
>          assert(c.count(3) == 1);
>          assert(c.count(4) == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -75,7 +75,7 @@ int main()
>          assert(r.second);
>      }
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<double, std::hash<double>,
>                                  std::equal_to<double>,
> min_allocator<double>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/iterators.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>          assert(std::distance(c.cbegin(), c.cend()) == c.size());
>          C::const_iterator i;
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/load_factor.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/load_factor.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/load_factor.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/load_factor.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          const C c;
>          assert(c.load_factor() == 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/local_iterators.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/local_iterators.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/local_iterators.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/local_iterators.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -203,7 +203,7 @@ int main()
>          assert(std::distance(i, j) == 1);
>          assert(*i == 4);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/max_bucket_count.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/max_bucket_count.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/max_bucket_count.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/max_bucket_count.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -27,7 +27,7 @@ int main()
>          const C c;
>          assert(c.max_bucket_count() > 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/max_load_factor.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/max_load_factor.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/max_load_factor.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/max_load_factor.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>          c.max_load_factor(2.5);
>          assert(c.max_load_factor() == 2.5);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/max_size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/max_size.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -26,7 +26,7 @@ int main()
>          std::unordered_set<int> u;
>          assert(u.max_size() > 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> u;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.set/rehash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/rehash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/rehash.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/rehash.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -67,7 +67,7 @@ int main()
>          assert(c.bucket_count() == 31);
>          test(c);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.set/reserve.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/reserve.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/reserve.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/reserve.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -73,7 +73,7 @@ int main()
>          assert(c.bucket_count() >= 16);
>          test(c);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int, std::hash<int>,
>                                        std::equal_to<int>,
> min_allocator<int>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/swap_member.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/swap_member.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/swap_member.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/swap_member.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -386,7 +386,7 @@ int main()
>          assert(std::distance(c2.cbegin(), c2.cend()) == c2.size());
>          assert(c2.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_hash<std::hash<int> > Hash;
>          typedef test_compare<std::equal_to<int> > Compare;
>
> Modified: libcxx/trunk/test/std/containers/unord/unord.set/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/containers/unord/unord.set/types.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/containers/unord/unord.set/types.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          static_assert((std::is_same<C::size_type, std::size_t>::value),
> "");
>          static_assert((std::is_same<C::difference_type,
> std::ptrdiff_t>::value), "");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<short, std::hash<short>,
>                                    std::equal_to<short>,
> min_allocator<short>> C;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -134,7 +134,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<int> A;
>          typedef std::unordered_set<int,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<int> A;
>          typedef std::unordered_set<int,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -162,7 +162,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef min_allocator<int> A;
>          typedef std::unordered_set<int,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -105,7 +105,7 @@ int main()
>          assert(c.max_load_factor() == 1);
>      }
>  #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_set>
>  #include <cassert>
>
> @@ -43,7 +45,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_set<MoveOnly> C;
>          static_assert(std::is_nothrow_default_constructible<C>::value,
> "");
> @@ -67,5 +68,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_default_constructible<C>::value,
> "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,14 +11,14 @@
>
>  // ~unordered_set() // implied noexcept;
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_set>
>  #include <cassert>
>
>  #include "MoveOnly.h"
>  #include "test_allocator.h"
>
> -#if __has_feature(cxx_noexcept)
> -
>  template <class T>
>  struct some_comp
>  {
> @@ -36,11 +36,8 @@ struct some_hash
>      ~some_hash() noexcept(false);
>  };
>
> -#endif
> -
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_set<MoveOnly> C;
>          static_assert(std::is_nothrow_destructible<C>::value, "");
> @@ -64,5 +61,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_destructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -57,7 +57,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -60,7 +60,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -62,7 +62,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -63,7 +63,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -64,7 +64,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -103,7 +103,7 @@ int main()
>
>          assert(c0.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -110,7 +110,7 @@ int main()
>
>          assert(c0.empty());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef int P;
>          typedef min_allocator<int> A;
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,6 +17,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_set>
>  #include <cassert>
>
> @@ -42,7 +44,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_set<MoveOnly> C;
>          static_assert(std::is_nothrow_move_assignable<C>::value, "");
> @@ -66,5 +67,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_assignable<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>
>  // This tests a conforming extension
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <unordered_set>
>  #include <cassert>
>
> @@ -39,7 +41,6 @@ struct some_hash
>
>  int main()
>  {
> -#if __has_feature(cxx_noexcept)
>      {
>          typedef std::unordered_set<MoveOnly> C;
>          static_assert(std::is_nothrow_move_constructible<C>::value, "");
> @@ -63,5 +64,4 @@ int main()
>
> some_comp<MoveOnly>> C;
>          static_assert(!std::is_nothrow_move_constructible<C>::value, "");
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -60,7 +60,7 @@ int main()
>          assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) <
> FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -63,7 +63,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -66,7 +66,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>          assert(std::fabs(c.load_factor() -
> (float)c.size()/c.bucket_count()) < FLT_EPSILON);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<int,
>                                     test_hash<std::hash<int> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -43,7 +43,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -47,7 +47,7 @@ int main()
>          assert(c.load_factor() == 0);
>          assert(c.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::unordered_set<NotConstructible,
>                                     test_hash<std::hash<NotConstructible>
> >,
>
> Modified:
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -386,7 +386,7 @@ int main()
>          assert(std::distance(c2.cbegin(), c2.cend()) == c2.size());
>          assert(c2.max_load_factor() == 1);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef test_hash<std::hash<int> > Hash;
>          typedef test_compare<std::equal_to<int> > Compare;
>
> Modified: libcxx/trunk/test/std/depr/depr.c.headers/stdarg_h.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/depr/depr.c.headers/stdarg_h.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/depr/depr.c.headers/stdarg_h.pass.cpp (original)
> +++ libcxx/trunk/test/std/depr/depr.c.headers/stdarg_h.pass.cpp Tue Jun 14
> 16:31:42 2016
> @@ -11,11 +11,13 @@
>
>  #include <stdarg.h>
>
> +#include "test_macros.h"
> +
>  #ifndef va_arg
>  #error va_arg not defined
>  #endif
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  #  ifndef va_copy
>  #    error va_copy is not defined when c++ >= 11
>  #  endif
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.access/back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.access/back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.access/back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.access/back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <typename CharT>
>  bool test ( const CharT *s, size_t len ) {
>      std::experimental::basic_string_view<CharT> sv ( s, len );
> @@ -30,7 +32,7 @@ int main () {
>      assert ( test ( L"ABCDE", 5 ));
>      assert ( test ( L"a", 1 ));
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert ( test ( u"ABCDE", 5 ));
>      assert ( test ( u"a", 1 ));
>
> @@ -38,7 +40,7 @@ int main () {
>      assert ( test ( U"a", 1 ));
>  #endif
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      constexpr std::experimental::basic_string_view<char> sv ( "ABC", 2 );
>      static_assert ( sv.length() ==  2,  "" );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.access/data.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.access/data.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.access/data.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.access/data.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <typename CharT>
>  void test ( const CharT *s, size_t len ) {
>      std::experimental::basic_string_view<CharT> sv ( s, len );
> @@ -29,7 +31,7 @@ int main () {
>      test ( L"ABCDE", 5 );
>      test ( L"a", 1 );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( u"ABCDE", 5 );
>      test ( u"a", 1 );
>
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.access/front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.access/front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.access/front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.access/front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <typename CharT>
>  bool test ( const CharT *s, size_t len ) {
>      std::experimental::basic_string_view<CharT> sv ( s, len );
> @@ -30,7 +32,7 @@ int main () {
>      assert ( test ( L"ABCDE", 5 ));
>      assert ( test ( L"a", 1 ));
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert ( test ( u"ABCDE", 5 ));
>      assert ( test ( u"a", 1 ));
>
> @@ -38,7 +40,7 @@ int main () {
>      assert ( test ( U"a", 1 ));
>  #endif
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      constexpr std::experimental::basic_string_view<char> sv ( "ABC", 2 );
>      static_assert ( sv.length() ==  2,  "" );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.access/index.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.access/index.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.access/index.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.access/index.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <typename CharT>
>  void test ( const CharT *s, size_t len ) {
>      std::experimental::basic_string_view<CharT> sv ( s, len );
> @@ -32,7 +34,7 @@ int main () {
>      test ( L"ABCDE", 5 );
>      test ( L"a", 1 );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( u"ABCDE", 5 );
>      test ( u"a", 1 );
>
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -19,6 +19,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template<typename SV>
>  void test1 () {
>  #if _LIBCPP_STD_VER > 11
> @@ -73,7 +75,7 @@ int main () {
>      test2 ( L"a", 1 );
>      test2 ( L"", 0 );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test2 (
> u"ABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDE",
> 105 );
>      test2 ( u"ABCDE", 5 );
>      test2 ( u"a", 1 );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main () {
>      test ( L"A" );
>      test ( L"" );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( u"QBCDE" );
>      test ( u"A" );
>      test ( u"" );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -18,6 +18,8 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template<typename CharT>
>  void test ( const CharT *s, size_t sz ) {
>      {
> @@ -53,7 +55,7 @@ int main () {
>      }
>  #endif
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( u"QBCDE", 5 );
>      test ( u"QBCDE", 2 );
>      test ( u"", 0 );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.cons/from_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -18,6 +18,8 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  struct dummy_char_traits : public std::char_traits<char> {};
>
>  template<typename CharT, typename Traits>
> @@ -37,7 +39,7 @@ int main () {
>      test ( std::wstring(L"") );
>      test ( std::wstring() );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( std::u16string{u"QBCDE"} );
>      test ( std::u16string{u""} );
>      test ( std::u16string{} );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <class S>
>  void
>  test(S s)
> @@ -51,7 +53,7 @@ int main()
>      test(wstring_view  ());
>      test(string_view   ( "123"));
>      test(wstring_view  (L"123"));
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test(u16string_view{u"123"});
>      test(u32string_view{U"123"});
>  #endif
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/end.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.iterators/end.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/end.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/end.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <class S>
>  void
>  test(S s)
> @@ -59,7 +61,7 @@ int main()
>      test(wstring_view  ());
>      test(string_view   ( "123"));
>      test(wstring_view  (L"123"));
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test(u16string_view{u"123"});
>      test(u32string_view{U"123"});
>  #endif
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <class S>
>  void
>  test(S s)
> @@ -52,7 +54,7 @@ int main()
>      test(wstring_view  ());
>      test(string_view   ( "123"));
>      test(wstring_view  (L"123"));
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test(u16string_view{u"123"});
>      test(u32string_view{U"123"});
>  #endif
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <class S>
>  void
>  test(S s)
> @@ -59,7 +61,7 @@ int main()
>      test(wstring_view  ());
>      test(string_view   ( "123"));
>      test(wstring_view  (L"123"));
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test(u16string_view{u"123"});
>      test(u32string_view{U"123"});
>  #endif
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template<typename CharT>
>  void test ( const CharT *s, size_t len ) {
>      typedef std::experimental::basic_string_view<CharT> SV;
> @@ -48,7 +50,7 @@ int main () {
>      test ( L"a", 1 );
>      test ( L"", 0 );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( u"ABCDE", 5 );
>      test ( u"a", 1 );
>      test ( u"", 0 );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,6 +16,8 @@
>  #include <cassert>
>  #include <iostream>
>
> +#include "test_macros.h"
> +
>  template<typename CharT>
>  void test ( const CharT *s, size_t len ) {
>      typedef std::experimental::basic_string_view<CharT> SV;
> @@ -55,7 +57,7 @@ int main () {
>      test ( L"a", 1 );
>      test ( L"", 0 );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( u"ABCDE", 5 );
>      test ( u"a", 1 );
>      test ( u"", 0 );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template<typename CharT>
>  void test ( const CharT *s, size_t len ) {
>      typedef std::experimental::basic_string_view<CharT> SV;
> @@ -55,7 +57,7 @@ int main () {
>      test ( L"a", 1 );
>      test ( L"", 0 );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( u"ABCDE", 5 );
>      test ( u"a", 1 );
>      test ( u"", 0 );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template<typename CharT>
>  void test ( const CharT *s, size_t len ) {
>      typedef std::experimental::basic_string_view<CharT> SV;
> @@ -54,7 +56,7 @@ int main () {
>      test ( L"a", 1 );
>      test ( L"", 0 );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test ( u"ABCDE", 5 );
>      test ( u"a", 1 );
>      test ( u"", 0 );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,6 +16,8 @@
>  #include <experimental/string_view>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template<typename CharT>
>  void test ( const CharT *s ) {
>      typedef std::experimental::basic_string_view<CharT> string_view_t;
> @@ -49,7 +51,7 @@ int main () {
>      test ( L"a" );
>      test ( L"" );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test (
> u"ABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDE"
> );
>      test ( u"ABCDE" );
>      test ( u"a" );
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -72,7 +72,7 @@ int main()
>      test(L"abcdefghijklmnopqrst", L"abcdefghijklmnopqrst", 0);
>      }
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      test(U"", U"", 0);
>      test(U"", U"abcde", -5);
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -70,7 +70,7 @@ int main () {
>      test(L"abcdefghijklmnopqrst", L"abcdefghij", 10);
>      test(L"abcdefghijklmnopqrst", L"abcdefghijklmnopqrst", 0);
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test(u"",                     u"", 0);
>      test(u"",                     u"abcde", -5);
>      test(u"",                     u"abcdefghij", -10);
>
> Modified:
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/experimental/string.view/string.view.ops/to_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -30,7 +30,7 @@ void test ( const CharT *s ) {
>      assert ( sv1.size() == str1.size ());
>      assert ( std::char_traits<CharT>::compare ( sv1.data(), str1.data(),
> sv1.size()) == 0 );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      auto str2 = sv1.to_string(min_allocator<CharT>());
>      assert ( sv1.size() == str2.size ());
>      assert ( std::char_traits<CharT>::compare ( sv1.data(), str2.data(),
> sv1.size()) == 0 );
> @@ -44,7 +44,7 @@ void test ( const CharT *s ) {
>      assert ( sv1.size() == 0);
>      assert ( sv1.size() == str1.size ());
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      auto str2 = sv1.to_string(min_allocator<CharT>());
>      assert ( sv1.size() == str2.size ());
>  #endif
> @@ -62,7 +62,7 @@ int main () {
>      test ( L"a" );
>      test ( L"" );
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test (
> u"ABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDE"
> );
>      test ( u"ABCDE" );
>      test ( u"a" );
>
> Modified: libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -13,7 +13,9 @@
>  // template <class T, size_t N> constexpr T* data(T (&array)[N])
> noexcept;           // C++17
>  // template <class E> constexpr const E* data(initializer_list<E> il)
> noexcept;      // C++17
>
> -#if __cplusplus <= 201402L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER <= 14
>  int main () {}
>  #else
>
>
> Modified: libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -12,7 +12,9 @@
>  // template <class T, size_t N> constexpr bool empty(const T (&array)[N])
> noexcept;  // C++17
>  // template <class E> constexpr bool empty(initializer_list<E> il)
> noexcept;         // C++17
>
> -#if __cplusplus <= 201402L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER <= 14
>  int main () {}
>  #else
>
>
> Modified: libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -11,7 +11,9 @@
>  // template <class C> constexpr auto size(const C& c) ->
> decltype(c.size());         // C++17
>  // template <class T, size_t N> constexpr size_t size(const T
> (&array)[N]) noexcept; // C++17
>
> -#if __cplusplus <= 201402L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER <= 14
>  int main () {}
>  #else
>
>
> Modified: libcxx/trunk/test/std/iterators/iterator.range/begin-end.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/iterator.range/begin-end.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/iterators/iterator.range/begin-end.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/iterators/iterator.range/begin-end.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -15,7 +15,9 @@
>  // template <class E> reverse_iterator<const E*>
> rbegin(initializer_list<E> il);
>  // template <class E> reverse_iterator<const E*> rend(initializer_list<E>
> il);
>
> -#if __cplusplus >= 201103L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER >= 11
>  #include <iterator>
>  #include <cassert>
>  #include <vector>
>
> Modified:
> libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp
> (original)
> +++
> libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,11 +16,13 @@
>  #include <iterator>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  struct S { S(); }; // not constexpr
>
>  int main()
>  {
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      constexpr std::istream_iterator<S> it;
>      }
>
> Modified:
> libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,13 +16,15 @@
>  #include <iterator>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>      {
>      typedef std::istream_iterator<int> T;
>      T it;
>      assert(it == T());
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      constexpr T it2;
>  #endif
>      }
>
> Modified:
> libcxx/trunk/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -20,13 +20,15 @@
>  #include <sstream>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>      {
>          typedef std::istreambuf_iterator<char> T;
>          T it;
>          assert(it == T());
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>          constexpr T it2;
>  #endif
>      }
> @@ -34,7 +36,7 @@ int main()
>          typedef std::istreambuf_iterator<wchar_t> T;
>          T it;
>          assert(it == T());
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>          constexpr T it2;
>  #endif
>      }
>
> Modified:
> libcxx/trunk/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -18,6 +18,8 @@
>  #include <cstdlib>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  class A
>  {
>      int data_;
> @@ -37,7 +39,7 @@ public:
>      friend bool operator==(const B& x, const B& y) {return x.data_ ==
> y.data_;}
>  };
>
> -#if __cplusplus > 201103L
> +#if TEST_STD_VER > 11
>  struct Final final {};
>  #endif
>
> @@ -105,7 +107,7 @@ int main()
>              assert(i == 7);
>          }
>      }
> -#if __cplusplus > 201103L
> +#if TEST_STD_VER > 11
>      {
>          try
>          {
>
> Modified:
> libcxx/trunk/test/std/language.support/support.runtime/cstdarg.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.runtime/cstdarg.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/language.support/support.runtime/cstdarg.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/language.support/support.runtime/cstdarg.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -11,11 +11,13 @@
>
>  #include <cstdarg>
>
> +#include "test_macros.h"
> +
>  #ifndef va_arg
>  #error va_arg not defined
>  #endif
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  #  ifndef va_copy
>  #    error va_copy is not defined when c++ >= 11
>  #  endif
>
> Modified:
> libcxx/trunk/test/std/language.support/support.types/offsetof.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.types/offsetof.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/language.support/support.types/offsetof.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/language.support/support.types/offsetof.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -7,8 +7,12 @@
>  //
>
>  //===----------------------------------------------------------------------===//
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <cstddef>
>
> +#include "test_macros.h"
> +
>  #ifndef offsetof
>  #error offsetof not defined
>  #endif
> @@ -20,7 +24,5 @@ struct A
>
>  int main()
>  {
> -#if (__has_feature(cxx_noexcept))
>      static_assert(noexcept(offsetof(A, x)), "");
> -#endif
>  }
>
> Modified: libcxx/trunk/test/std/numerics/c.math/cmath.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/numerics/c.math/cmath.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/numerics/c.math/cmath.pass.cpp (original)
> +++ libcxx/trunk/test/std/numerics/c.math/cmath.pass.cpp Tue Jun 14
> 16:31:42 2016
> @@ -13,6 +13,7 @@
>  #include <type_traits>
>  #include <cassert>
>
> +#include "test_macros.h"
>  #include "hexfloat.h"
>
>  // convertible to int/float/double/etc
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/at.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/at.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/string.access/at.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/strings/basic.string/string.access/at.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>      test(S("123"), 2);
>      test(S("123"), 3);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(), 0);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/string.access/back.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/strings/basic.string/string.access/back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>      test(S("1"));
>      test(S("1234567890123456789012345678901234567890"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S("1"));
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/db_back.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/db_back.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.access/db_back.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.access/db_back.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      assert(s.back() == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      S s(1, '\0');
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cback.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/db_cback.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cback.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cback.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      assert(s.back() == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      const S s;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cfront.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/db_cfront.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cfront.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cfront.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      assert(s.front() == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      const S s;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cindex.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/db_cindex.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cindex.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.access/db_cindex.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      assert(s[1] == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      const S s;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/db_front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/db_front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.access/db_front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.access/db_front.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      assert(s.front() == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      S s(1, '\0');
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/db_index.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/db_index.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.access/db_index.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.access/db_index.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      assert(s[1] == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      S s;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/front.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/front.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.access/front.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.access/front.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>      test(S("1"));
>      test(S("1234567890123456789012345678901234567890"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S("1"));
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.access/index.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.access/index.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.access/index.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.access/index.pass.cpp Tue
> Jun 14 16:31:42 2016
> @@ -36,7 +36,7 @@ int main()
>      const S s2 = S();
>      assert(s2[0] == '\0');
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      S s("0123456789");
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.capacity/capacity.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.capacity/capacity.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.capacity/capacity.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.capacity/capacity.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -49,7 +49,7 @@ int main()
>      s.erase(50);
>      test(s);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      S s;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.capacity/clear.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.capacity/clear.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.capacity/clear.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.capacity/clear.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -39,7 +39,7 @@ int main()
>      s.erase(50);
>      test(s);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      S s;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.capacity/empty.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.capacity/empty.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.capacity/empty.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.capacity/empty.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      test(S("123"));
>      test(S("12345678901234567890123456789012345678901234567890"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.capacity/length.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.capacity/length.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.capacity/length.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.capacity/length.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      test(S("123"));
>      test(S("12345678901234567890123456789012345678901234567890"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.capacity/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.capacity/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.capacity/max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.capacity/max_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -63,7 +63,7 @@ int main()
>      test(S("123"));
>      test(S("12345678901234567890123456789012345678901234567890"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -37,7 +37,7 @@ int main()
>      test(S("123"));
>      test(S("12345678901234567890123456789012345678901234567890"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.capacity/size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.capacity/size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.capacity/size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.capacity/size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      test(S("123"), 3);
>      test(S("12345678901234567890123456789012345678901234567890"), 50);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(), 0);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/begin.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/begin.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/begin.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/begin.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>      test(S());
>      test(S("123"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/cbegin.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/cbegin.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/cbegin.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/cbegin.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>      test(S());
>      test(S("123"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/cend.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/cend.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/cend.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/cend.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      test(S());
>      test(S("123"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/crbegin.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/crbegin.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/crbegin.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/crbegin.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>      test(S());
>      test(S("123"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/crend.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/crend.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/crend.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/crend.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -31,7 +31,7 @@ int main()
>      test(S());
>      test(S("123"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      bool b = s1.begin() < s2.begin();
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      S s1;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      int i = s1.begin() - s2.begin();
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      S s1;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>      assert(i[1] == 0);
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> C;
>      C c(1, '\0');
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -35,7 +35,7 @@ int main()
>      i += 2;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> C;
>      C c(1, '\0');
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      --i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> C;
>      C c(1, '\0');
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      ++i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> C;
>      C c(1, '\0');
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -32,7 +32,7 @@ int main()
>      char j = *i;
>      assert(false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> C;
>      C c(1, '\0');
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/end.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/end.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/end.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/end.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ int main()
>      test(S());
>      test(S("123"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/rbegin.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/rbegin.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/rbegin.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/rbegin.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -38,7 +38,7 @@ int main()
>      test(S());
>      test(S("123"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.iterators/rend.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.iterators/rend.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.iterators/rend.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.iterators/rend.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ int main()
>      test(S());
>      test(S("123"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S());
>
> Modified: libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line.pass.cpp (original)
> +++ libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line.pass.cpp Tue Jun 14 16:31:42 2016
> @@ -48,7 +48,7 @@ int main()
>          assert(in.eof());
>          assert(s == L"   ghij");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>          std::istringstream in(" abc\n  def\n   ghij");
>
> Modified: libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_delim.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_delim.pass.cpp (original)
> +++ libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_delim.pass.cpp Tue Jun 14 16:31:42 2016
> @@ -54,7 +54,7 @@ int main()
>          assert(in.eof());
>          assert(s == L"   ghij");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>          std::istringstream in(" abc*  def**   ghij");
>
> Modified: libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_delim_rv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_delim_rv.pass.cpp (original)
> +++ libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_delim_rv.pass.cpp Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>          getline(std::wistringstream(L" abc*  def*   ghij"), s, L'*');
>          assert(s == L" abc");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>          S s("initial text");
>
> Modified: libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_rv.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_rv.pass.cpp (original)
> +++ libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/get_line_rv.pass.cpp Tue Jun 14 16:31:42 2016
> @@ -33,7 +33,7 @@ int main()
>          getline(std::wistringstream(L" abc\n  def\n   ghij"), s);
>          assert(s == L" abc");
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>          S s("initial text");
>
> Modified: libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/stream_extract.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/stream_extract.pass.cpp (original)
> +++ libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/stream_extract.pass.cpp Tue Jun 14 16:31:42 2016
> @@ -66,7 +66,7 @@ int main()
>          in >> s;
>          assert(in.fail());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>          std::istringstream in("a bc defghij");
>
> Modified: libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/stream_insert.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/stream_insert.pass.cpp (original)
> +++ libcxx/trunk/test/std/strings/basic.string/string.nonmembers/
> string.io/stream_insert.pass.cpp Tue Jun 14 16:31:42 2016
> @@ -52,7 +52,7 @@ int main()
>          assert(out.good());
>          assert(L"   " + s == out.str());
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>          typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>          std::basic_ostringstream<S::value_type, S::traits_type,
> S::allocator_type> out;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op%21%3D/pointer_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test("abcdefghijklmnopqrst", S("abcdefghij"), true);
>      test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test("", S(""), false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op%21%3D/string_pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), "abcdefghij", true);
>      test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), "", false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op%21%3D/string_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), S("abcdefghij"), true);
>      test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), S(""), false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op%2B/char_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0('a', S(""), S("a"));
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op%2B/pointer_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -83,7 +83,7 @@ int main()
>
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0("", S(""), S(""));
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op%2B/string_char.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -59,7 +59,7 @@ int main()
>
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0(S(""), '1', S("1"));
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op%2B/string_pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -83,7 +83,7 @@ int main()
>
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0(S(""), "", S(""));
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op%2B/string_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -143,7 +143,7 @@ int main()
>
>  #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0(S(""), S(""), S(""));
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator%3D%3D/pointer_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test("abcdefghijklmnopqrst", S("abcdefghij"), false);
>      test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test("", S(""), true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator%3D%3D/string_pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), "abcdefghij", false);
>      test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), "", true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator%3D%3D/string_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), S("abcdefghij"), false);
>      test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), S(""), true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test("abcdefghijklmnopqrst", S("abcdefghij"), true);
>      test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test("", S(""), false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), "abcdefghij", true);
>      test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), "", false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), S("abcdefghij"), true);
>      test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), S(""), false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt%3D/pointer_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test("abcdefghijklmnopqrst", S("abcdefghij"), true);
>      test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test("", S(""), true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt%3D/string_pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), "abcdefghij", true);
>      test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), "", true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt%3D/string_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), S("abcdefghij"), true);
>      test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), S(""), true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test("abcdefghijklmnopqrst", S("abcdefghij"), false);
>      test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test("", S(""), false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), "abcdefghij", false);
>      test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), "", false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), S("abcdefghij"), false);
>      test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), S(""), false);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt%3D/pointer_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test("abcdefghijklmnopqrst", S("abcdefghij"), false);
>      test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test("", S(""), true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt%3D/string_pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -45,7 +45,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), "abcdefghij", false);
>      test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), "", true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt%3D/string_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -46,7 +46,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), S("abcdefghij"), false);
>      test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), S(""), true);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ int main()
>      test(S("abcdefghij"));
>      test(S("abcdefghijklmnopqrst"));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""));
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -34,7 +34,7 @@ int main()
>      test(S("abcdefghij", A(2)), A(2));
>      test(S("abcdefghijklmnopqrst", A(3)), A(3));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef min_allocator<char> A;
>      typedef std::basic_string<char, std::char_traits<char>, A> S;
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -53,7 +53,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), "abcdefghij", 10);
>      test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), "", 0);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -362,7 +362,7 @@ int main()
>      test1<S>();
>      test2<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -1304,7 +1304,7 @@ int main()
>      test10<S>();
>      test11<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -362,7 +362,7 @@ int main()
>      test1<S>();
>      test2<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -5885,7 +5885,7 @@ int main()
>      test54<S>();
>      test55<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/string.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/string.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/string.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_compare/string.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -53,7 +53,7 @@ int main()
>      test(S("abcdefghijklmnopqrst"), S("abcdefghij"), 10);
>      test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), S(""), 0);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -67,7 +67,7 @@ int main()
>      test(S("gfsmthlkon"), 'q', 0);
>      test(S("laenfsbridchgotmkqpj"), 'q', 0);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), 'q', 0, S::npos);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -148,7 +148,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -375,7 +375,7 @@ int main()
>      test2<S>();
>      test3<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -147,7 +147,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>      test(S("gfsmthlkon"), 'e', S::npos);
>      test(S("laenfsbridchgotmkqpj"), 'e', 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), 'e', 0, S::npos);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -148,7 +148,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -375,7 +375,7 @@ int main()
>      test2<S>();
>      test3<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -147,7 +147,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>      test(S("gfsmthlkon"), 'i', 9);
>      test(S("laenfsbridchgotmkqpj"), 'i', 19);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), 'i', 0, S::npos);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -148,7 +148,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -375,7 +375,7 @@ int main()
>      test2<S>();
>      test3<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -147,7 +147,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>      test(S("gfsmthlkon"), 'm', 3);
>      test(S("laenfsbridchgotmkqpj"), 'm', 15);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), 'm', 0, S::npos);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -148,7 +148,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -375,7 +375,7 @@ int main()
>      test2<S>();
>      test3<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -147,7 +147,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>      test(S("abcdeabcde"), 'c', 2);
>      test(S("abcdeabcdeabcdeabcde"), 'c', 2);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), 'c', 0, S::npos);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -154,7 +154,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -375,7 +375,7 @@ int main()
>      test2<S>();
>      test3<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/string_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/string_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/string_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_find/string_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -147,7 +147,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>      test(S("abcdeabcde"), 'b', 6);
>      test(S("abcdeabcdeabcdeabcde"), 'b', 16);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test(S(""), 'b', 0, S::npos);
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -155,7 +155,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -375,7 +375,7 @@ int main()
>      test2<S>();
>      test3<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -147,7 +147,7 @@ int main()
>      test0<S>();
>      test1<S>();
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef std::basic_string<char, std::char_traits<char>,
> min_allocator<char>> S;
>      test0<S>();
>
> Modified:
> libcxx/trunk/test/std/strings/basic.string/string.require/contiguous.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.require/contiguous.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/basic.string/string.require/contiguous.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/basic.string/string.require/contiguous.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -41,7 +41,7 @@ int main()
>      test_contiguous(S("1", A(5)));
>
>  test_contiguous(S("1234567890123456789012345678901234567890123456789012345678901234567890",
> A(7)));
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      {
>      typedef min_allocator<char> A;
>      typedef std::basic_string<char, std::char_traits<char>, A> S;
>
> Modified: libcxx/trunk/test/std/strings/basic.string/types.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/types.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/strings/basic.string/types.pass.cpp (original)
> +++ libcxx/trunk/test/std/strings/basic.string/types.pass.cpp Tue Jun 14
> 16:31:42 2016
> @@ -79,7 +79,7 @@ int main()
>                                  std::char_traits<char> >::value), "");
>      static_assert((std::is_same<std::basic_string<char>::allocator_type,
>                                  std::allocator<char> >::value), "");
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test<std::char_traits<char>, min_allocator<char> >();
>  #endif
>  }
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      char16_t c = u'\0';
>      std::char_traits<char16_t>::assign(c, u'a');
>      assert(c == u'a');
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char16_t>::compare(u"", u"", 0) == 0);
>      assert(std::char_traits<char16_t>::compare(NULL, NULL, 0) == 0);
>
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      char16_t c = u'\0';
>      assert(std::char_traits<char16_t>::eq(u'a', u'a'));
>      assert(!std::char_traits<char16_t>::eq(u'a', u'A'));
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert( std::char_traits<char16_t>::eq_int_type(u'a', u'a'));
>      assert(!std::char_traits<char16_t>::eq_int_type(u'a', u'A'));
>
>  assert(!std::char_traits<char16_t>::eq_int_type(std::char_traits<char16_t>::eof(),
> u'A'));
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char16_t>::length(u"") == 0);
>      assert(std::char_traits<char16_t>::length(u"a") == 1);
>      assert(std::char_traits<char16_t>::length(u"aa") == 2);
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      char16_t c = u'\0';
>      assert(!std::char_traits<char16_t>::lt(u'a', u'a'));
>      assert( std::char_traits<char16_t>::lt(u'A', u'a'));
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char16_t>::not_eof(u'a') == u'a');
>      assert(std::char_traits<char16_t>::not_eof(u'A') == u'A');
>  #endif
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char16_t>::to_char_type(u'a') == u'a');
>      assert(std::char_traits<char16_t>::to_char_type(u'A') == u'A');
>  #endif
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char16_t>::to_int_type(u'a') == u'a');
>      assert(std::char_traits<char16_t>::to_int_type(u'A') == u'A');
>  #endif
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      char32_t c = U'\0';
>      std::char_traits<char32_t>::assign(c, U'a');
>      assert(c == U'a');
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char32_t>::compare(U"", U"", 0) == 0);
>      assert(std::char_traits<char32_t>::compare(NULL, NULL, 0) == 0);
>
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      char32_t c = U'\0';
>      assert(std::char_traits<char32_t>::eq(U'a', U'a'));
>      assert(!std::char_traits<char32_t>::eq(U'a', U'A'));
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert( std::char_traits<char32_t>::eq_int_type(U'a', U'a'));
>      assert(!std::char_traits<char32_t>::eq_int_type(U'a', U'A'));
>
>  assert(!std::char_traits<char32_t>::eq_int_type(std::char_traits<char32_t>::eof(),
> U'A'));
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char32_t>::length(U"") == 0);
>      assert(std::char_traits<char32_t>::length(U"a") == 1);
>      assert(std::char_traits<char32_t>::length(U"aa") == 2);
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      char32_t c = U'\0';
>      assert(!std::char_traits<char32_t>::lt(U'a', U'a'));
>      assert( std::char_traits<char32_t>::lt(U'A', U'a'));
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char32_t>::not_eof(U'a') == U'a');
>      assert(std::char_traits<char32_t>::not_eof(U'A') == U'A');
>  #endif
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char32_t>::to_char_type(U'a') == U'a');
>      assert(std::char_traits<char32_t>::to_char_type(U'A') == U'A');
>  #endif
>
> Modified:
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -16,10 +16,12 @@
>  #include <string>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      assert(std::char_traits<char32_t>::to_int_type(U'a') == U'a');
>      assert(std::char_traits<char32_t>::to_int_type(U'A') == U'A');
>  #endif
>
> Modified:
> libcxx/trunk/test/std/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -21,6 +21,8 @@
>  #include <thread>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  typedef std::chrono::milliseconds ms;
>
>  std::once_flag flg0;
> @@ -171,7 +173,7 @@ public:
>      void operator()(int&) {}
>  };
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  // reference qualifiers on functions are a C++11 extension
>  struct RefQual
>  {
> @@ -240,7 +242,7 @@ int main()
>          int i = 0;
>          std::call_once(f, NonCopyable(), i);
>      }
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>  // reference qualifiers on functions are a C++11 extension
>      {
>          std::once_flag f1, f2;
>
> Modified:
> libcxx/trunk/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -11,7 +11,9 @@
>  #include <memory>
>  #include <cassert>
>
> -#if __cplusplus >= 201103L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER >= 11
>  // #include <memory>
>  //
>  // template <class Alloc>
>
> Modified:
> libcxx/trunk/test/std/utilities/function.objects/func.memfn/member_function.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/func.memfn/member_function.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/function.objects/func.memfn/member_function.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/function.objects/func.memfn/member_function.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -15,6 +15,8 @@
>  #include <functional>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  struct A
>  {
>      char test0() {return 'a';}
> @@ -69,7 +71,7 @@ int main()
>      test0(std::mem_fn(&A::test0));
>      test1(std::mem_fn(&A::test1));
>      test2(std::mem_fn(&A::test2));
> -#if __has_feature(cxx_noexcept)
> +#if TEST_STD_VER >= 11
>      static_assert((noexcept(std::mem_fn(&A::test0))), ""); // LWG#2489
>  #endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/unord.hash/enum.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -12,7 +12,9 @@
>  // make sure that we can hash enumeration values
>  // Not very portable
>
> -#if __cplusplus >= 201402L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER >= 14
>
>  #include <functional>
>  #include <cassert>
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -21,6 +21,8 @@
>  #include <type_traits>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  template <class T>
>  struct A
>  {
> @@ -61,7 +63,7 @@ int main()
>          const B<int> b = {};
>          assert(std::allocator_traits<B<int> >::max_size(b) == 100);
>      }
> -#if __cplusplus >= 201103
> +#if TEST_STD_VER >= 11
>      {
>          std::allocator<int> a;
>
>  static_assert(noexcept(std::allocator_traits<std::allocator<int>>::max_size(a))
> == true, "");
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -10,7 +10,9 @@
>  #include <memory>
>  #include <cassert>
>
> -#if __cplusplus >= 201103L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER >= 11
>  // #include <memory>
>  //
>  // template <class Alloc>
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -19,6 +19,8 @@
>  #include <memory>
>  #include <type_traits>
>
> +#include "test_macros.h"
> +
>  struct A
>  {
>      typedef char element_type;
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -13,6 +13,8 @@
>  #include <type_traits>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int A_constructed = 0;
>
>  struct A
> @@ -29,7 +31,7 @@ public:
>
>  int main()
>  {
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      typedef std::aligned_storage<3*sizeof(A),
> std::alignment_of<A>::value>::type
>              Storage;
>      Storage buffer;
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -23,12 +23,15 @@
>  // atomic_compare_exchange_strong(shared_ptr<T>* p, shared_ptr<T>* v,
>  //                                shared_ptr<T> w);
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p(new int(4));
>          std::shared_ptr<int> v(new int(3));
> @@ -49,5 +52,4 @@ int main()
>          assert(*v == 4);
>          assert(*w == 2);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -24,12 +24,15 @@
>  //                                         shared_ptr<T> w, memory_order
> success,
>  //                                         memory_order failure);
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p(new int(4));
>          std::shared_ptr<int> v(new int(3));
> @@ -54,5 +57,4 @@ int main()
>          assert(*v == 4);
>          assert(*w == 2);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -23,12 +23,15 @@
>  // atomic_compare_exchange_weak(shared_ptr<T>* p, shared_ptr<T>* v,
>  //                              shared_ptr<T> w);
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p(new int(4));
>          std::shared_ptr<int> v(new int(3));
> @@ -49,5 +52,4 @@ int main()
>          assert(*v == 4);
>          assert(*w == 2);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -24,12 +24,15 @@
>  //                                       shared_ptr<T> w, memory_order
> success,
>  //                                       memory_order failure);
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p(new int(4));
>          std::shared_ptr<int> v(new int(3));
> @@ -54,5 +57,4 @@ int main()
>          assert(*v == 4);
>          assert(*w == 2);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -22,12 +22,15 @@
>  // shared_ptr<T>
>  // atomic_exchange(shared_ptr<T>* p, shared_ptr<T> r)
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p(new int(4));
>          std::shared_ptr<int> r(new int(3));
> @@ -35,5 +38,4 @@ int main()
>          assert(*p == 3);
>          assert(*r == 4);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -22,12 +22,15 @@
>  // shared_ptr<T>
>  // atomic_exchange_explicit(shared_ptr<T>* p, shared_ptr<T> r)
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p(new int(4));
>          std::shared_ptr<int> r(new int(3));
> @@ -35,5 +38,4 @@ int main()
>          assert(*p == 3);
>          assert(*r == 4);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -17,15 +17,17 @@
>  // bool
>  // atomic_is_lock_free(const shared_ptr<T>* p);
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          const std::shared_ptr<int> p(new int(3));
>          assert(std::atomic_is_lock_free(&p) == false);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -22,16 +22,18 @@
>  // shared_ptr<T>
>  // atomic_load(const shared_ptr<T>* p)
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p(new int(3));
>          std::shared_ptr<int> q = std::atomic_load(&p);
>          assert(*q == *p);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -22,16 +22,18 @@
>  // shared_ptr<T>
>  // atomic_load_explicit(const shared_ptr<T>* p, memory_order mo)
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          const std::shared_ptr<int> p(new int(3));
>          std::shared_ptr<int> q = std::atomic_load_explicit(&p,
> std::memory_order_relaxed);
>          assert(*q == *p);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -22,17 +22,19 @@
>  // void
>  // atomic_store(shared_ptr<T>* p, shared_ptr<T> r)
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p;
>          std::shared_ptr<int> r(new int(3));
>          std::atomic_store(&p, r);
>          assert(*p == *r);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -22,17 +22,19 @@
>  // void
>  // atomic_store_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order
> mo)
>
> +// UNSUPPORTED: c++98, c++03
> +
>  #include <memory>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __has_feature(cxx_atomic)
>      {
>          std::shared_ptr<int> p;
>          std::shared_ptr<int> r(new int(3));
>          std::atomic_store_explicit(&p, r, std::memory_order_seq_cst);
>          assert(*p == *r);
>      }
> -#endif
>  }
>
> Modified:
> libcxx/trunk/test/std/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/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ int main()
>      assert(test_deleter<A>::count == 0);
>      assert(test_deleter<A>::dealloc_count == 1);
>      test_deleter<A>::dealloc_count = 0;
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      // Test an allocator that returns class-type pointers
>      {
>      std::shared_ptr<A> p(nullptr, test_deleter<A>(1),
> min_allocator<void>());
>
> Modified:
> libcxx/trunk/test/std/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/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -68,7 +68,7 @@ int main()
>      assert(test_deleter<A>::count == 0);
>      assert(test_deleter<A>::dealloc_count == 1);
>      test_deleter<A>::dealloc_count = 0;
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      // Test an allocator that returns class-type pointers
>      {
>      A* ptr = new A;
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -19,6 +19,8 @@
>  #include <cstdlib>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  bool throw_next = false;
>
>  void* operator new(std::size_t s) throw(std::bad_alloc)
> @@ -105,7 +107,7 @@ int main()
>      fn(std::unique_ptr<int>(new int));
>      }
>
> -#if __cplusplus >= 201402L
> +#if TEST_STD_VER >= 14
>      // LWG 2415
>      {
>      std::unique_ptr<int, void (*)(int*)> p(nullptr, assert_deleter<int>);
>
> Modified:
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -112,7 +112,7 @@ int main()
>      assert(test_allocator<Two>::alloc_count == 0);
>
>      test<bare_allocator<void> >();
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>      test<min_allocator<void> >();
>  #endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.hel/bool_constant.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.hel/bool_constant.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/std/utilities/meta/meta.hel/bool_constant.pass.cpp
> (original)
> +++ libcxx/trunk/test/std/utilities/meta/meta.hel/bool_constant.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,9 +14,11 @@
>  #include <type_traits>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
> -#if __cplusplus > 201402L
> +#if TEST_STD_VER > 14
>      typedef std::bool_constant<true> _t;
>      static_assert(_t::value, "");
>      static_assert((std::is_same<_t::value_type, bool>::value), "");
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -164,7 +164,7 @@ int main()
>      // Use alignof(std::max_align_t) below to find the max alignment
> instead of
>      // hardcoding it, because it's different on different platforms.
>      // (For example 8 on arm and 16 on x86.)
> -#if __cplusplus < 201103L
> +#if TEST_STD_VER < 11
>  #define alignof __alignof__
>  #endif
>      {
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>  #include <type_traits>
>  #include <climits>
>
> +#include "test_macros.h"
> +
>  enum E { V = INT_MIN };
>  enum F { W = UINT_MAX };
>
> @@ -29,7 +31,7 @@ int main()
>      static_assert((std::is_same<std::underlying_type_t<F>,
> unsigned>::value), "");
>  #endif
>
> -#if __has_feature(cxx_strong_enums)
> +#if TEST_STD_VER >= 11
>      enum G : char { };
>
>      static_assert((std::is_same<std::underlying_type<G>::type,
> char>::value),
> @@ -37,5 +39,5 @@ int main()
>  #if _LIBCPP_STD_VER > 11
>      static_assert((std::is_same<std::underlying_type_t<G>, char>::value),
> "");
>  #endif
> -#endif // __has_feature(cxx_strong_enums)
> +#endif // TEST_STD_VER >= 11
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -13,6 +13,8 @@
>
>  #include <type_traits>
>
> +#include "test_macros.h"
> +
>  template <class T>
>  void test_has_virtual_destructor()
>  {
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -21,7 +21,7 @@ struct A
>  {
>      explicit A(int);
>      A(int, double);
> -#if __has_feature(cxx_access_control_sfinae)
> +#if TEST_STD_VER >= 11
>  private:
>  #endif
>      A(char);
> @@ -91,7 +91,7 @@ int main()
>      test_is_constructible<int&, int&> ();
>
>      test_is_not_constructible<A> ();
> -#if __has_feature(cxx_access_control_sfinae)
> +#if TEST_STD_VER >= 11
>      test_is_not_constructible<A, char> ();
>  #else
>      test_is_constructible<A, char> ();
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -79,7 +79,7 @@ int main()
>      test_is_not_copy_assignable<int[]> ();
>      test_is_not_copy_assignable<int[3]> ();
>  #endif
> -#if __has_feature(cxx_access_control_sfinae)
> +#if TEST_STD_VER >= 11
>      test_is_not_copy_assignable<B> ();
>  #endif
>      test_is_not_copy_assignable<void> ();
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -89,7 +89,7 @@ int main()
>      test_is_not_copy_constructible<void>();
>      test_is_not_copy_constructible<Abstract>();
>      test_is_not_copy_constructible<C>();
> -#if __has_feature(cxx_access_control_sfinae)
> +#if TEST_STD_VER >= 11
>      test_is_not_copy_constructible<B>();
>  #endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -100,7 +100,7 @@ int main()
>      test_is_not_default_constructible<char[]>();
>      test_is_not_default_constructible<Abstract>();
>      test_is_not_default_constructible<NoDefaultConstructor>();
> -#if __has_feature(cxx_access_control_sfinae)
> +#if TEST_STD_VER >= 11
>      test_is_not_default_constructible<B>();
>  #endif
>  }
>
> Modified:
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -65,7 +65,7 @@ class Abstract
>      virtual ~Abstract() = 0;
>  };
>
> -#if __has_feature(cxx_attributes)
> +#if TEST_STD_VER >= 11
>  class Final final {
>  };
>  #else
>
> Modified:
> libcxx/trunk/test/std/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -14,6 +14,8 @@
>  #include <chrono>
>  #include <type_traits>
>
> +#include "test_macros.h"
> +
>  template <class T>
>  void
>  test()
>
> Modified:
> libcxx/trunk/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -9,7 +9,9 @@
>
>  // This is for bugs 18853 and 19118
>
> -#if __cplusplus >= 201103L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER >= 11
>
>  #include <tuple>
>  #include <functional>
>
> Modified:
> libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -21,7 +21,9 @@
>  #include <string>
>  #include <cassert>
>
> -#if __cplusplus > 201103L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER > 11
>
>  struct Empty {};
>
>
> Modified:
> libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -18,6 +18,8 @@
>  #include <utility>
>  #include <cassert>
>
> +#include "test_macros.h"
> +
>  int main()
>  {
>      {
> @@ -27,7 +29,7 @@ int main()
>          assert(std::get<1>(p) == 4);
>      }
>
> -#if __cplusplus > 201103L
> +#if TEST_STD_VER > 11
>      {
>          typedef std::pair<int, short> P;
>          constexpr P p1(3, 4);
>
> Modified:
> libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> ---
> libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp
> (original)
> +++
> libcxx/trunk/test/std/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp
> Tue Jun 14 16:31:42 2016
> @@ -18,7 +18,9 @@
>  #include <utility>
>  #include <cassert>
>
> -#if __cplusplus > 201103L
> +#include "test_macros.h"
> +
> +#if TEST_STD_VER > 11
>  struct S {
>     std::pair<int, int> a;
>     int k;
> @@ -41,7 +43,7 @@ int main()
>          assert(std::get<1>(p) == 6);
>      }
>
> -#if __cplusplus > 201103L
> +#if TEST_STD_VER > 11
>      {
>          static_assert(S().k == 1, "");
>          static_assert(std::get<1>(getP()) == 4, "");
>
> Modified: libcxx/trunk/test/support/MoveOnly.h
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/MoveOnly.h?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/support/MoveOnly.h (original)
> +++ libcxx/trunk/test/support/MoveOnly.h Tue Jun 14 16:31:42 2016
> @@ -10,6 +10,8 @@
>  #ifndef MOVEONLY_H
>  #define MOVEONLY_H
>
> +#include "test_macros.h"
> +
>  #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
>
>  #include <cstddef>
>
> Modified: libcxx/trunk/test/support/count_new.hpp
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/count_new.hpp?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/support/count_new.hpp (original)
> +++ libcxx/trunk/test/support/count_new.hpp Tue Jun 14 16:31:42 2016
> @@ -14,13 +14,11 @@
>  # include <cassert>
>  # include <new>
>
> -#ifndef __has_feature
> -#  define __has_feature(x) 0
> -#endif
> +#include "test_macros.h"
>
> -#if  __has_feature(address_sanitizer) \
> -  || __has_feature(memory_sanitizer) \
> -  || __has_feature(thread_sanitizer)
> +#if  TEST_HAS_FEATURE(address_sanitizer) \
> +  || TEST_HAS_FEATURE(memory_sanitizer) \
> +  || TEST_HAS_FEATURE(thread_sanitizer)
>  #define DISABLE_NEW_COUNT
>  #endif
>
>
> Modified: libcxx/trunk/test/support/min_allocator.h
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/min_allocator.h?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/support/min_allocator.h (original)
> +++ libcxx/trunk/test/support/min_allocator.h Tue Jun 14 16:31:42 2016
> @@ -40,7 +40,7 @@ public:
>  };
>
>
> -#if __cplusplus >= 201103L
> +#if TEST_STD_VER >= 11
>
>  #include <memory>
>
> @@ -286,6 +286,6 @@ public:
>      friend bool operator!=(min_allocator x, min_allocator y) {return !(x
> == y);}
>  };
>
> -#endif  // __cplusplus >= 201103L
> +#endif  // TEST_STD_VER >= 11
>
>  #endif  // MIN_ALLOCATOR_H
>
> Modified: libcxx/trunk/test/support/test_macros.h
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/test_macros.h?rev=272716&r1=272715&r2=272716&view=diff
>
> ==============================================================================
> --- libcxx/trunk/test/support/test_macros.h (original)
> +++ libcxx/trunk/test/support/test_macros.h Tue Jun 14 16:31:42 2016
> @@ -35,6 +35,7 @@
>  #endif
>
>  /* Make a nice name for the standard version */
> +#ifndef TEST_STD_VER
>  #if  __cplusplus <= 199711L
>  # define TEST_STD_VER 3
>  #elif __cplusplus <= 201103L
> @@ -44,6 +45,7 @@
>  #else
>  # define TEST_STD_VER 99    // greater than current standard
>  #endif
> +#endif
>
>  /* Features that were introduced in C++14 */
>  #if TEST_STD_VER >= 14
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160615/6fb14c66/attachment-0001.html>