generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

N3644 support for <unordered_set> and <unordered_map>

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@187915 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2013-08-07 21:30:44 +00:00
parent b92ee614f2
commit 193ef03eb5
5 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/__hash_table
View File

@ -112,6 +112,9 @@ public:
pointer;
_LIBCPP_INLINE_VISIBILITY __hash_iterator() _NOEXCEPT
#if _LIBCPP_STD_VER > 11
: __node_(nullptr)
#endif
{
#if _LIBCPP_DEBUG_LEVEL >= 2
__get_db()->__insert_i(this);
@ -248,6 +251,9 @@ public:
typedef __hash_iterator<__non_const_node_pointer> __non_const_iterator;
_LIBCPP_INLINE_VISIBILITY __hash_const_iterator() _NOEXCEPT
#if _LIBCPP_STD_VER > 11
: __node_(nullptr)
#endif
{
#if _LIBCPP_DEBUG_LEVEL >= 2
__get_db()->__insert_i(this);

14
test/containers/unord/unord.map/iterators.pass.cpp
View File

@ -108,4 +108,18 @@ int main()
C::const_iterator i;
}
#endif
#if _LIBCPP_STD_VER > 11
{ // N3664 testing
typedef std::unordered_map<int,double> C;
C::iterator ii1{}, ii2{};
C::iterator ii4 = ii1;
C::const_iterator cii{};
assert ( ii1 == ii2 );
assert ( ii1 == ii4 );
assert ( ii1 == cii );
assert ( !(ii1 != ii2 ));
assert ( !(ii1 != cii ));
}
#endif
}

14
test/containers/unord/unord.multimap/iterators.pass.cpp
View File

@ -114,4 +114,18 @@ int main()
C::const_iterator i;
}
#endif
#if _LIBCPP_STD_VER > 11
{ // N3664 testing
typedef std::unordered_multimap<int,double> C;
C::iterator ii1{}, ii2{};
C::iterator ii4 = ii1;
C::const_iterator cii{};
assert ( ii1 == ii2 );
assert ( ii1 == ii4 );
assert ( ii1 == cii );
assert ( !(ii1 != ii2 ));
assert ( !(ii1 != cii ));
}
#endif
}

14
test/containers/unord/unord.multiset/iterators.pass.cpp
View File

@ -107,4 +107,18 @@ int main()
C::const_iterator i;
}
#endif
#if _LIBCPP_STD_VER > 11
{ // N3664 testing
typedef std::unordered_multiset<int> C;
C::iterator ii1{}, ii2{};
C::iterator ii4 = ii1;
C::const_iterator cii{};
assert ( ii1 == ii2 );
assert ( ii1 == ii4 );
assert ( ii1 == cii );
assert ( !(ii1 != ii2 ));
assert ( !(ii1 != cii ));
}
#endif
}

14
test/containers/unord/unord.set/iterators.pass.cpp
View File

@ -107,4 +107,18 @@ int main()
C::const_iterator i;
}
#endif
#if _LIBCPP_STD_VER > 11
{ // N3664 testing
typedef std::unordered_set<int> C;
C::iterator ii1{}, ii2{};
C::iterator ii4 = ii1;
C::const_iterator cii{};
assert ( ii1 == ii2 );
assert ( ii1 == ii4 );
assert ( ii1 == cii );
assert ( !(ii1 != ii2 ));
assert ( !(ii1 != cii ));
}
#endif
}