forked from boostorg/intrusive
Support Clang's -Wconversion -Wfloat-conversion -Wsign-conversion with -Werror
This commit is contained in:
@@ -105,7 +105,7 @@ bool priv_algo_is_permutation(ForwardIterator1 first1, ForwardIterator1 last1, F
|
|||||||
continue; //We've seen this one before.
|
continue; //We've seen this one before.
|
||||||
}
|
}
|
||||||
distance_type matches = (priv_algo_count)(first2, last2, *scan);
|
distance_type matches = (priv_algo_count)(first2, last2, *scan);
|
||||||
if (0 == matches || (priv_algo_count)(scan, last1, *scan != matches)){
|
if (0 == matches || (priv_algo_count)(scan, last1, *scan) != matches){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2459,7 +2459,7 @@ class hashtable_impl
|
|||||||
siterator it = this->priv_find(key, hash_func, equal_func, bucket_num, h, prev);
|
siterator it = this->priv_find(key, hash_func, equal_func, bucket_num, h, prev);
|
||||||
bool const success = it != this->priv_invalid_local_it();
|
bool const success = it != this->priv_invalid_local_it();
|
||||||
|
|
||||||
size_type cnt(0);
|
std::size_t cnt(0);
|
||||||
if(success){
|
if(success){
|
||||||
if(optimize_multikey){
|
if(optimize_multikey){
|
||||||
cnt = this->priv_erase_from_single_bucket
|
cnt = this->priv_erase_from_single_bucket
|
||||||
@@ -2480,7 +2480,7 @@ class hashtable_impl
|
|||||||
this->priv_erasure_update_cache();
|
this->priv_erasure_update_cache();
|
||||||
}
|
}
|
||||||
|
|
||||||
return cnt;
|
return static_cast<size_type>(cnt);
|
||||||
}
|
}
|
||||||
|
|
||||||
//! <b>Effects</b>: Erases all of the elements.
|
//! <b>Effects</b>: Erases all of the elements.
|
||||||
|
Reference in New Issue
Block a user