define {first,second}_type in the struct declared by _WX_DECLARE_PAIR too for compatibility with std::pair, we can avoid #ifdefs in the code using the hash then (#9725)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -425,6 +425,8 @@ protected: \
|
||||
CLASSEXP CLASSNAME \
|
||||
{ \
|
||||
public: \
|
||||
typedef KEY_T first_type; \
|
||||
typedef VALUE_T second_type; \
|
||||
typedef KEY_T t1; \
|
||||
typedef VALUE_T t2; \
|
||||
typedef const KEY_T const_t1; \
|
||||
|
@@ -380,11 +380,7 @@ void MakeKeyValuePair(size_t i, size_t count, T*& key, ValueT& value)
|
||||
template <class HashMapT>
|
||||
void HashMapTest()
|
||||
{
|
||||
#if wxUSE_STL && defined HAVE_STL_HASH_MAP
|
||||
typedef typename HashMapT::value_type::second_type value_type;
|
||||
#else
|
||||
typedef typename HashMapT::value_type::t2 value_type;
|
||||
#endif
|
||||
typedef typename HashMapT::key_type key_type;
|
||||
typedef typename HashMapT::iterator Itor;
|
||||
|
||||
|
Reference in New Issue
Block a user