Revert "Revert "Merge to upstream r304942.""
This reverts commit 38a0d5af7e.
Test: make checkbuild
Test: ./run_tests.py
Test: ./run_tests.py --bitness 64
This commit is contained in:
@@ -7,6 +7,8 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// UNSUPPORTED: c++98, c++03
|
||||
|
||||
// <set>
|
||||
|
||||
// class set
|
||||
@@ -21,7 +23,6 @@
|
||||
|
||||
int main()
|
||||
{
|
||||
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
|
||||
{
|
||||
typedef std::set<MoveOnly> M;
|
||||
typedef std::pair<M::iterator, bool> R;
|
||||
@@ -50,7 +51,6 @@ int main()
|
||||
assert(m.size() == 3);
|
||||
assert(*r.first == 3);
|
||||
}
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::set<MoveOnly, std::less<MoveOnly>, min_allocator<MoveOnly>> M;
|
||||
typedef std::pair<M::iterator, bool> R;
|
||||
@@ -79,6 +79,4 @@ int main()
|
||||
assert(m.size() == 3);
|
||||
assert(*r.first == 3);
|
||||
}
|
||||
#endif
|
||||
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user