Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-13 18:20:06 +00:00
parent 101198ba0c
commit d7ad5a0289
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/hashmap.h
View File

@@ -425,6 +425,8 @@ protected: \
CLASSEXP CLASSNAME \ CLASSEXP CLASSNAME \
{ \ { \
public: \ public: \
typedef KEY_T first_type; \
typedef VALUE_T second_type; \
typedef KEY_T t1; \ typedef KEY_T t1; \
typedef VALUE_T t2; \ typedef VALUE_T t2; \
typedef const KEY_T const_t1; \ typedef const KEY_T const_t1; \

4
tests/hashes/hashes.cpp
View File

@@ -380,11 +380,7 @@ void MakeKeyValuePair(size_t i, size_t count, T*& key, ValueT& value)
template <class HashMapT> template <class HashMapT>
void HashMapTest() void HashMapTest()
{ {
#if wxUSE_STL && defined HAVE_STL_HASH_MAP
typedef typename HashMapT::value_type::second_type value_type; 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::key_type key_type;
typedef typename HashMapT::iterator Itor; typedef typename HashMapT::iterator Itor;