X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..53cdd2c11d11b6286936b93158b157610b169edd:/include/wx/hashset.h

diff --git a/include/wx/hashset.h b/include/wx/hashset.h
index ae254ad6ea..250f530431 100644
--- a/include/wx/hashset.h
+++ b/include/wx/hashset.h
@@ -6,7 +6,7 @@
 // Created:     11/08/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HASHSET_H_
@@ -14,7 +14,23 @@
 
 #include "wx/hashmap.h"
 
-#if wxUSE_STL && defined(HAVE_STL_HASH_MAP)
+// see comment in wx/hashmap.h which also applies to different standard hash
+// set classes
+
+#if wxUSE_STL && \
+    (defined(HAVE_STD_UNORDERED_SET) || defined(HAVE_TR1_UNORDERED_SET))
+
+#if defined(HAVE_STD_UNORDERED_SET)
+    #include <unordered_set>
+    #define WX_HASH_SET_BASE_TEMPLATE std::unordered_set
+#elif defined(HAVE_TR1_UNORDERED_SET)
+    #include <tr1/unordered_set>
+    #define WX_HASH_SET_BASE_TEMPLATE std::tr1::unordered_set
+#else
+    #error Update this code: unordered_set is available, but I do not know where.
+#endif
+
+#elif wxUSE_STL && defined(HAVE_STL_HASH_MAP)
 
 #if defined(HAVE_EXT_HASH_MAP)
     #include <ext/hash_set>
@@ -22,10 +38,38 @@
     #include <hash_set>
 #endif
 
-#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )\
-    typedef WX_HASH_MAP_NAMESPACE::hash_set< KEY_T, HASH_T, KEY_EQ_T > CLASSNAME;
+#define WX_HASH_SET_BASE_TEMPLATE WX_HASH_MAP_NAMESPACE::hash_set
+
+#endif // different hash_set/unordered_set possibilities
 
-#else // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+#ifdef WX_HASH_SET_BASE_TEMPLATE
+
+// we need to define the class declared by _WX_DECLARE_HASH_SET as a class and
+// not a typedef to allow forward declaring it
+#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )  \
+CLASSEXP CLASSNAME                                                            \
+    : public WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >             \
+{                                                                             \
+public:                                                                       \
+    explicit CLASSNAME(size_type n = 3,                                       \
+                       const hasher& h = hasher(),                            \
+                       const key_equal& ke = key_equal(),                     \
+                       const allocator_type& a = allocator_type())            \
+        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(n, h, ke, a)   \
+    {}                                                                        \
+    template <class InputIterator>                                            \
+    CLASSNAME(InputIterator f, InputIterator l,                               \
+              const hasher& h = hasher(),                                     \
+              const key_equal& ke = key_equal(),                              \
+              const allocator_type& a = allocator_type())                     \
+        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(f, l, h, ke, a)\
+    {}                                                                        \
+    CLASSNAME(const WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >& s)  \
+        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(s)             \
+    {}                                                                        \
+}
+
+#else // no appropriate STL class, use our own implementation
 
 // this is a complex way of defining an easily inlineable identity function...
 #define _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME, CLASSEXP )            \
@@ -51,14 +95,18 @@ _WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T, CLASSNAME##_wxImplementation_KeyEx,
 CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable             \
 {                                                                            \
 public:                                                                      \
+    _WX_DECLARE_PAIR( iterator, bool, Insert_Result, CLASSEXP )              \
+                                                                             \
     wxEXPLICIT CLASSNAME( size_type hint = 100, hasher hf = hasher(),        \
                           key_equal eq = key_equal() )                       \
         : CLASSNAME##_wxImplementation_HashTable( hint, hf, eq,              \
                       CLASSNAME##_wxImplementation_KeyEx() ) {}              \
                                                                              \
-    void insert( const key_type& key )                                       \
+    Insert_Result insert( const key_type& key )                              \
     {                                                                        \
-        GetOrCreateNode( key );                                              \
+        bool created;                                                        \
+        Node *node = GetOrCreateNode( key, created );                        \
+        return Insert_Result( iterator( node, this ), created );             \
     }                                                                        \
                                                                              \
     const_iterator find( const const_key_type& key ) const                   \
@@ -77,11 +125,12 @@ public:                                                                      \
     void erase( const const_iterator& it ) { erase( *it ); }                 \
                                                                              \
     /* count() == 0 | 1 */                                                   \
-    size_type count( const const_key_type& key )                             \
+    size_type count( const const_key_type& key ) const                       \
         { return GetNode( key ) ? 1 : 0; }                                   \
 }
 
-#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+#endif // STL/wx implementations
+
 
 // these macros are to be used in the user code
 #define WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
@@ -94,7 +143,7 @@ public:                                                                      \
 
 #define WX_DECLARE_EXPORTED_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
     WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, \
-                                   CLASSNAME, class WXDLLEXPORT )
+                                   CLASSNAME, class WXDLLIMPEXP_CORE )
 
 // delete all hash elements
 //
@@ -103,6 +152,11 @@ public:                                                                      \
 //     be called (a decent compiler should give a warning about it, but don't
 //     count on it)!
 #define WX_CLEAR_HASH_SET(type, hashset)                                     \
-    WX_CLEAR_HASH_MAP(type, hashset)
+    {                                                                        \
+        type::iterator it, en;                                               \
+        for( it = (hashset).begin(), en = (hashset).end(); it != en; ++it )  \
+            delete *it;                                                      \
+        (hashset).clear();                                                   \
+    }
 
 #endif // _WX_HASHSET_H_