LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename <__hash_table> traits so they don't conflict with similar traits.

Browse Source 
In particular <__tree> defines many of the same types of traits classes.


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@261421 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-02-20 07:59:16 +00:00
parent 227b47c292
commit 66e344fa9b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/libcxx/containers/unord/key_value_traits.pass.cpp
View File

@@ -18,7 +18,7 @@
void testKeyValueTrait() {
{
typedef int Tp;
typedef std::__key_value_types<Tp> Traits;
typedef std::__hash_key_value_types<Tp> Traits;
static_assert((std::is_same<Traits::key_type, int>::value), "");
static_assert((std::is_same<Traits::__node_value_type, Tp>::value), "");
static_assert((std::is_same<Traits::__container_value_type, Tp>::value), "");
@@ -26,7 +26,7 @@ void testKeyValueTrait() {
}
{
typedef std::pair<int, int> Tp;
typedef std::__key_value_types<Tp> Traits;
typedef std::__hash_key_value_types<Tp> Traits;
static_assert((std::is_same<Traits::key_type, Tp>::value), "");
static_assert((std::is_same<Traits::__node_value_type, Tp>::value), "");
static_assert((std::is_same<Traits::__container_value_type, Tp>::value), "");
@@ -34,7 +34,7 @@ void testKeyValueTrait() {
}
{
typedef std::pair<const int, int> Tp;
typedef std::__key_value_types<Tp> Traits;
typedef std::__hash_key_value_types<Tp> Traits;
static_assert((std::is_same<Traits::key_type, Tp>::value), "");
static_assert((std::is_same<Traits::__node_value_type, Tp>::value), "");
static_assert((std::is_same<Traits::__container_value_type, Tp>::value), "");
@@ -42,7 +42,7 @@ void testKeyValueTrait() {
}
{
typedef std::__hash_value_type<int, int> Tp;
typedef std::__key_value_types<Tp> Traits;
typedef std::__hash_key_value_types<Tp> Traits;
static_assert((std::is_same<Traits::key_type, int>::value), "");
static_assert((std::is_same<Traits::mapped_type, int>::value), "");
static_assert((std::is_same<Traits::__node_value_type, Tp>::value), "");