32/64 bit universal builds support

[wxWidgets.git] / tests / hashes / hashes.cpp

diff --git a/tests/hashes/hashes.cpp b/tests/hashes/hashes.cpp
index a2777285914831ee9b349836b14205b6fdc13db4..bd62198675aaa31a96116305c890493ce1c61bfc 100644 (file)
--- a/tests/hashes/hashes.cpp
+++ b/tests/hashes/hashes.cpp
@@ -264,17 +264,8 @@ void HashesTestCase::wxUntypedHashTableDeleteContents()
     CPPUNIT_ASSERT( FooObject::count == 0 );
 }
 
     CPPUNIT_ASSERT( FooObject::count == 0 );
 }
 

-#if WXWIN_COMPATIBILITY_2_4
-WX_DECLARE_LIST(Foo, wxListFoos);
-#endif
-

 WX_DECLARE_HASH(Foo, wxListFoos, wxHashFoos);
 
 WX_DECLARE_HASH(Foo, wxListFoos, wxHashFoos);
 

-#if WXWIN_COMPATIBILITY_2_4
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListFoos)
-#endif
-

 void HashesTestCase::wxTypedHashTableTest()
 {
     // need a nested scope for destruction
 void HashesTestCase::wxTypedHashTableTest()
 {
     // need a nested scope for destruction


@@ -365,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;
 }
 


@@ -389,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;
 


@@ -482,6 +469,12 @@ void HashesTestCase::LLongHashMapTest()  { HashMapTest<myLLongHashMap>();    }
 void HashesTestCase::ULLongHashMapTest() { HashMapTest<myULLongHashMap>();   }
 #endif
 
 void HashesTestCase::ULLongHashMapTest() { HashMapTest<myULLongHashMap>();   }
 #endif
 

+#ifdef __VISUALC__
+    #if __VISUALC__ <= 1200
+        #pragma warning(disable:4284) // operator->() returns a non-UDT
+    #endif
+#endif // __VISUALC__
+

 // test compilation of basic set types
 WX_DECLARE_HASH_SET( int*, wxPointerHash, wxPointerEqual, myPtrHashSet );
 WX_DECLARE_HASH_SET( long, wxIntegerHash, wxIntegerEqual, myLongHashSet );
 // test compilation of basic set types
 WX_DECLARE_HASH_SET( int*, wxPointerHash, wxPointerEqual, myPtrHashSet );
 WX_DECLARE_HASH_SET( long, wxIntegerHash, wxIntegerEqual, myLongHashSet );