define {first,second}_type in the struct declared by _WX_DECLARE_PAIR too for compati...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index c6f6b0c20a10cd6a26f8040f6565c80324f8e46d..1c11d75f803cd04746224095860c334fc84e9312 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -425,6 +425,8 @@ protected: \
 CLASSEXP CLASSNAME \
 { \
 public: \
 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; \
     typedef KEY_T t1; \
     typedef VALUE_T t2; \
     typedef const KEY_T const_t1; \

diff --git a/tests/hashes/hashes.cpp b/tests/hashes/hashes.cpp
index e2a0f6bb3b410d9321f519a5fa5dba510bfae7a9..bd62198675aaa31a96116305c890493ce1c61bfc 100644 (file)
--- a/tests/hashes/hashes.cpp
+++ b/tests/hashes/hashes.cpp
@@ -356,7 +356,7 @@ IntT MakeKey(size_t i, size_t count)
     IntT max = 1;
     max <<= sizeof(KeyT) * 8 - 2;
     max -= count / 4 + 1;
     IntT max = 1;
     max <<= sizeof(KeyT) * 8 - 2;
     max -= count / 4 + 1;

-     
+

     return max / count * 4 * i + i / 3;
 }
 
     return max / count * 4 * i + i / 3;
 }
 


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