X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ed8c8dd1fe17ca76581ac387fe2e93a71af0617..80d2a664f89fdfb1a85f6bf183e21267829bd3cf:/include/wx/hashmap.h diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index cbf9fec263..b6ff1455e2 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -202,6 +202,7 @@ public: \ { \ public: \ const_iterator() : Iterator() {} \ + const_iterator(iterator i) : Iterator(i) {} \ const_iterator( Node* node, const Self* ht ) \ : Iterator( node, (Self*)ht ) {} \ const_iterator& operator++() { PlusPlus();return *this; } \ @@ -640,7 +641,10 @@ public: \ \ /* count() == 0 | 1 */ \ size_type count( const const_key_type& key ) \ - { return GetNode( key ) ? 1u : 0u; } \ + { \ + /* explicit cast needed to suppress CodeWarrior warnings */ \ + return (size_type)(GetNode( key ) ? 1 : 0); \ + } \ } #endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)