// Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c)
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_HASH_H__
#define _WX_HASH_H__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "hash.h"
-#endif
-
#include "wx/defs.h"
+#include "wx/string.h"
#if !wxUSE_STL
- #include "wx/list.h"
-#endif
-#if WXWIN_COMPATIBILITY_2_4
- #include "wx/dynarray.h"
+ #include "wx/object.h"
+#else
+ class WXDLLIMPEXP_FWD_BASE wxObject;
#endif
-class WXDLLIMPEXP_BASE wxObject;
-
// the default size of the hash
#define wxHASH_SIZE_DEFAULT (1000)
* the list to find the desired item.
*/
-// ----------------------------------------------------------------------------
-// this is the base class for object hashes: hash tables which contain
-// pointers to objects
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_STL
-
-class WXDLLIMPEXP_BASE wxHashTableBase : public wxObject
-{
-public:
- wxHashTableBase();
-
- void Create(wxKeyType keyType = wxKEY_INTEGER,
- size_t size = wxHASH_SIZE_DEFAULT);
- void Destroy();
-
- size_t GetSize() const { return m_hashSize; }
- size_t GetCount() const { return m_count; }
-
- void DeleteContents(bool flag);
-
-protected:
- // find the node for (key, value)
- wxNodeBase *GetNode(long key, long value) const;
-
- // the array of lists in which we store the values for given key hash
- wxListBase **m_hashTable;
-
- // the size of m_lists array
- size_t m_hashSize;
-
- // the type of indexing we use
- wxKeyType m_keyType;
-
- // the total number of elements in the hash
- size_t m_count;
-
- // should we delete our data?
- bool m_deleteContents;
-
-private:
- // no copy ctor/assignment operator (yet)
- DECLARE_NO_COPY_CLASS(wxHashTableBase)
-};
-
-#else
-
-#include "wx/hashmap.h"
-
-#if !defined(wxENUM_KEY_TYPE_DEFINED)
-#define wxENUM_KEY_TYPE_DEFINED
-
-enum wxKeyType
-{
- wxKEY_NONE,
- wxKEY_INTEGER,
- wxKEY_STRING
-};
-
-#endif
-
union wxHashKeyValue
{
long integer;
- wxChar *string;
-};
-
-struct WXDLLIMPEXP_BASE wxHashTableHash
-{
- wxHashTableHash() { }
- wxHashTableHash( wxKeyType keyType ) : m_keyType( keyType ) { }
-
- wxKeyType m_keyType;
-
- unsigned long operator ()( const wxHashKeyValue& k ) const
- {
- if( m_keyType == wxKEY_STRING )
- return wxStringHash::wxCharStringHash( k.string );
- else
- return (unsigned long)k.integer;
- }
-};
-
-struct WXDLLIMPEXP_BASE wxHashTableEqual
-{
- wxHashTableEqual() { }
- wxHashTableEqual( wxKeyType keyType ) : m_keyType( keyType ) { }
-
- wxKeyType m_keyType;
-
- bool operator ()( const wxHashKeyValue& k1, const wxHashKeyValue& k2 ) const
- {
- if( m_keyType == wxKEY_STRING )
- return wxStrcmp( k1.string, k2.string ) == 0;
- else
- return k1.integer == k2.integer;
- }
+ wxString *string;
};
-WX_DECLARE_EXPORTED_HASH_MAP( wxHashKeyValue,
- void*,
- wxHashTableHash,
- wxHashTableEqual,
- wxHashTableBaseBaseBase );
-
-// hack: we should really have HASH_MULTI(MAP|SET), but this requires
-// less work
-
-class WXDLLIMPEXP_BASE wxHashTableBaseBase : public wxHashTableBaseBaseBase
-{
-public:
- wxHashTableBaseBase(size_t size, const wxHashTableHash& hash,
- const wxHashTableEqual& equal)
- : wxHashTableBaseBaseBase(size, hash, equal)
- { }
-
- void multi_insert(const wxHashKeyValue& key, void* value)
- {
- CreateNodeLast(value_type(key, value));
- }
-};
+// for some compilers (AIX xlC), defining it as friend inside the class is not
+// enough, so provide a real forward declaration
+class WXDLLIMPEXP_FWD_BASE wxHashTableBase;
-class WXDLLIMPEXP_BASE wxHashTableBase
+class WXDLLIMPEXP_BASE wxHashTableBase_Node
{
+ friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase;
+ typedef class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node _Node;
public:
- wxHashTableBase( wxKeyType keyType = wxKEY_INTEGER,
- size_t size = wxHASH_SIZE_DEFAULT )
- : m_map( size, wxHashTableHash( keyType ),
- wxHashTableEqual( keyType ) ),
- m_keyType( keyType ) { }
-
- ~wxHashTableBase() { Clear(); }
-
- size_t GetCount() const { return m_map.size(); }
-
- void Clear()
- {
- if( m_keyType == wxKEY_STRING )
- {
- for( wxHashTableBaseBase::iterator it = m_map.begin(),
- en = m_map.end();
- it != en; )
- {
- wxChar* tmp = it->first.string;
- ++it;
- delete[] tmp; // used in operator++
- }
- }
- m_map.clear();
- }
-protected:
- void DoPut( long key, void* data )
- {
- wxASSERT( m_keyType == wxKEY_INTEGER );
-
- wxHashKeyValue k; k.integer = key;
- m_map.multi_insert(k, data);
- }
-
- void DoPut( const wxChar* key, void* data )
- {
- wxASSERT( m_keyType == wxKEY_STRING );
-
- wxHashKeyValue k;
- k.string = wxStrcpy(new wxChar[wxStrlen(key) + 1], key);
- m_map.multi_insert(k, data);
- }
-
- void* DoGet( long key ) const
- {
- wxASSERT( m_keyType == wxKEY_INTEGER );
+ wxHashTableBase_Node( long key, void* value,
+ wxHashTableBase* table );
+ wxHashTableBase_Node( const wxString& key, void* value,
+ wxHashTableBase* table );
+ ~wxHashTableBase_Node();
- wxHashKeyValue k; k.integer = key;
- wxHashTableBaseBase::const_iterator it = m_map.find( k );
+ long GetKeyInteger() const { return m_key.integer; }
+ const wxString& GetKeyString() const { return *m_key.string; }
- return it != m_map.end() ? it->second : NULL;
- }
-
- void* DoGet( const wxChar* key ) const
- {
- wxASSERT( m_keyType == wxKEY_STRING );
-
- wxHashKeyValue k; k.string = (wxChar*)key;
- wxHashTableBaseBase::const_iterator it = m_map.find( k );
-
- return it != m_map.end() ? it->second : NULL;
- }
-
- void* DoDelete( long key )
- {
- wxASSERT( m_keyType == wxKEY_INTEGER );
-
- wxHashKeyValue k; k.integer = key;
- wxHashTableBaseBase::iterator it = m_map.find( k );
-
- if( it != m_map.end() )
- {
- void* data = it->second;
-
- m_map.erase( it );
- return data;
- }
-
- return NULL;
- }
+ void* GetData() const { return m_value; }
+ void SetData( void* data ) { m_value = data; }
- void* DoDelete( const wxChar* key )
- {
- wxASSERT( m_keyType == wxKEY_STRING );
+protected:
+ _Node* GetNext() const { return m_next; }
- wxHashKeyValue k; k.string = (wxChar*)key;
- wxHashTableBaseBase::iterator it = m_map.find( k );
-
- if( it != m_map.end() )
- {
- void* data = it->second;
- wxChar* k = it->first.string;
+protected:
+ // next node in the chain
+ wxHashTableBase_Node* m_next;
- m_map.erase( it );
- delete[] k;
- return data;
- }
+ // key
+ wxHashKeyValue m_key;
- return NULL;
- }
+ // value
+ void* m_value;
- wxHashTableBaseBase m_map;
- wxKeyType m_keyType;
+ // pointer to the hash containing the node, used to remove the
+ // node from the hash when the user deletes the node iterating
+ // through it
+ // TODO: move it to wxHashTable_Node (only wxHashTable supports
+ // iteration)
+ wxHashTableBase* m_hashPtr;
};
-#endif // !wxUSE_STL
-
+class WXDLLIMPEXP_BASE wxHashTableBase
#if !wxUSE_STL
-
-#if WXWIN_COMPATIBILITY_2_4
-
-// ----------------------------------------------------------------------------
-// a hash table which stores longs
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxHashTableLong : public wxObject
+ : public wxObject
+#endif
{
+ friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node;
public:
- wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT)
- { Init(size); }
- virtual ~wxHashTableLong();
+ typedef wxHashTableBase_Node Node;
- void Create(size_t size = wxHASH_SIZE_DEFAULT);
+ wxHashTableBase();
+ virtual ~wxHashTableBase() { }
+
+ void Create( wxKeyType keyType = wxKEY_INTEGER,
+ size_t size = wxHASH_SIZE_DEFAULT );
+ void Clear();
void Destroy();
- size_t GetSize() const { return m_hashSize; }
+ size_t GetSize() const { return m_size; }
size_t GetCount() const { return m_count; }
- void Put(long key, long value);
- long Get(long key) const;
- long Delete(long key);
+ void DeleteContents( bool flag ) { m_deleteContents = flag; }
+
+ static long MakeKey(const wxString& string);
protected:
- void Init(size_t size);
+ void DoPut( long key, long hash, void* data );
+ void DoPut( const wxString& key, long hash, void* data );
+ void* DoGet( long key, long hash ) const;
+ void* DoGet( const wxString& key, long hash ) const;
+ void* DoDelete( long key, long hash );
+ void* DoDelete( const wxString& key, long hash );
private:
- wxArrayLong **m_values,
- **m_keys;
+ // Remove the node from the hash, *only called from
+ // ~wxHashTable*_Node destructor
+ void DoRemoveNode( wxHashTableBase_Node* node );
- // the size of array above
- size_t m_hashSize;
+ // destroys data contained in the node if appropriate:
+ // deletes the key if it is a string and destrys
+ // the value if m_deleteContents is true
+ void DoDestroyNode( wxHashTableBase_Node* node );
- // the total number of elements in the hash
- size_t m_count;
+ // inserts a node in the table (at the end of the chain)
+ void DoInsertNode( size_t bucket, wxHashTableBase_Node* node );
- // not implemented yet
- DECLARE_NO_COPY_CLASS(wxHashTableLong)
-};
+ // removes a node from the table (fiven a pointer to the previous
+ // but does not delete it (only deletes its contents)
+ void DoUnlinkNode( size_t bucket, wxHashTableBase_Node* node,
+ wxHashTableBase_Node* prev );
-// ----------------------------------------------------------------------------
-// wxStringHashTable: a hash table which indexes strings with longs
-// ----------------------------------------------------------------------------
+ // unconditionally deletes node value (invoking the
+ // correct destructor)
+ virtual void DoDeleteContents( wxHashTableBase_Node* node ) = 0;
-class WXDLLIMPEXP_BASE wxStringHashTable : public wxObject
-{
-public:
- wxStringHashTable(size_t sizeTable = wxHASH_SIZE_DEFAULT);
- virtual ~wxStringHashTable();
+protected:
+ // number of buckets
+ size_t m_size;
- // add a string associated with this key to the table
- void Put(long key, const wxString& value);
+ // number of nodes (key/value pairs)
+ size_t m_count;
- // get the string from the key: if not found, an empty string is returned
- // and the wasFound is set to FALSE if not NULL
- wxString Get(long key, bool *wasFound = NULL) const;
+ // table
+ Node** m_table;
- // remove the item, returning TRUE if the item was found and deleted
- bool Delete(long key) const;
+ // key typ (INTEGER/STRING)
+ wxKeyType m_keyType;
- // clean up
- void Destroy();
+ // delete contents when hash is cleared
+ bool m_deleteContents;
private:
- wxArrayLong **m_keys;
- wxArrayString **m_values;
-
- // the size of array above
- size_t m_hashSize;
-
- DECLARE_NO_COPY_CLASS(wxStringHashTable)
+ DECLARE_NO_COPY_CLASS(wxHashTableBase)
};
-#endif // WXWIN_COMPATIBILITY_2_4
-
-#endif // !wxUSE_STL
-
// ----------------------------------------------------------------------------
// for compatibility only
// ----------------------------------------------------------------------------
-#if wxUSE_STL
+class WXDLLIMPEXP_BASE wxHashTable_Node : public wxHashTableBase_Node
+{
+ friend class WXDLLIMPEXP_FWD_BASE wxHashTable;
+public:
+ wxHashTable_Node( long key, void* value,
+ wxHashTableBase* table )
+ : wxHashTableBase_Node( key, value, table ) { }
+ wxHashTable_Node( const wxString& key, void* value,
+ wxHashTableBase* table )
+ : wxHashTableBase_Node( key, value, table ) { }
+
+ wxObject* GetData() const
+ { return (wxObject*)wxHashTableBase_Node::GetData(); }
+ void SetData( wxObject* data )
+ { wxHashTableBase_Node::SetData( data ); }
+
+ wxHashTable_Node* GetNext() const
+ { return (wxHashTable_Node*)wxHashTableBase_Node::GetNext(); }
+};
-class WXDLLIMPEXP_BASE wxHashTable : protected wxHashTableBase
+// should inherit protectedly, but it is public for compatibility in
+// order to publicly inherit from wxObject
+class WXDLLIMPEXP_BASE wxHashTable : public wxHashTableBase
{
- typedef wxHashTableBaseBase hash;
+ typedef wxHashTableBase hash;
public:
- class dummy;
-
- struct compatibility_iterator
- {
- hash::iterator m_iter;
- hash* m_hash;
-
- operator bool() const { return m_iter != m_hash->end(); }
- bool operator !() const { return m_iter == m_hash->end(); }
- compatibility_iterator( hash* li, hash::iterator it )
- : m_iter( it ), m_hash( li ) {}
- compatibility_iterator() { }
-
- dummy* operator->() { return (dummy*)this; }
- };
- typedef compatibility_iterator citer;
-
- class dummy
- {
- typedef hash::iterator it;
- typedef compatibility_iterator citer;
- public:
- wxObject* GetData() const
- {
- citer* i = (citer*)this;
- return (wxObject*)i->m_iter->second;
- }
- citer GetNext() const
- {
- citer* i = (citer*)this;
- it lit = i->m_iter;
- return citer( i->m_hash, ++lit );
- }
- void SetData( wxObject* e )
- {
- citer* i = (citer*)this;
- i->m_iter->second = e;
- }
- private:
- dummy();
- };
+ typedef wxHashTable_Node Node;
+ typedef wxHashTable_Node* compatibility_iterator;
public:
wxHashTable( wxKeyType keyType = wxKEY_INTEGER,
size_t size = wxHASH_SIZE_DEFAULT )
- : wxHashTableBase( keyType, size ) { }
+ : wxHashTableBase() { Create( keyType, size ); BeginFind(); }
+ wxHashTable( const wxHashTable& table );
- void Destroy() { Clear(); }
+ virtual ~wxHashTable() { Destroy(); }
+
+ const wxHashTable& operator=( const wxHashTable& );
// key and value are the same
- void Put(long value, wxObject *object) { DoPut( value, object ); }
- void Put(const wxChar *value, wxObject *object) { DoPut( value, object ); }
+ void Put(long value, wxObject *object)
+ { DoPut( value, value, object ); }
+ void Put(long lhash, long value, wxObject *object)
+ { DoPut( value, lhash, object ); }
+ void Put(const wxString& value, wxObject *object)
+ { DoPut( value, MakeKey( value ), object ); }
+ void Put(long lhash, const wxString& value, wxObject *object)
+ { DoPut( value, lhash, object ); }
// key and value are the same
- wxObject *Get(long value) const { return (wxObject*)DoGet( value ); }
- wxObject *Get(const wxChar *value) const { return (wxObject*)DoGet( value ); }
+ wxObject *Get(long value) const
+ { return (wxObject*)DoGet( value, value ); }
+ wxObject *Get(long lhash, long value) const
+ { return (wxObject*)DoGet( value, lhash ); }
+ wxObject *Get(const wxString& value) const
+ { return (wxObject*)DoGet( value, MakeKey( value ) ); }
+ wxObject *Get(long lhash, const wxString& value) const
+ { return (wxObject*)DoGet( value, lhash ); }
// Deletes entry and returns data if found
- wxObject *Delete(long key) { return (wxObject*)DoDelete( key ); }
- wxObject *Delete(const wxChar *key) { return (wxObject*)DoDelete( key ); }
+ wxObject *Delete(long key)
+ { return (wxObject*)DoDelete( key, key ); }
+ wxObject *Delete(long lhash, long key)
+ { return (wxObject*)DoDelete( key, lhash ); }
+ wxObject *Delete(const wxString& key)
+ { return (wxObject*)DoDelete( key, MakeKey( key ) ); }
+ wxObject *Delete(long lhash, const wxString& key)
+ { return (wxObject*)DoDelete( key, lhash ); }
-#if 0
- // Construct your own integer key from a string, e.g. in case
- // you need to combine it with something
- long MakeKey(const wxChar *string) const;
-#endif
// Way of iterating through whole hash table (e.g. to delete everything)
// Not necessary, of course, if you're only storing pointers to
// objects maintained separately
- void BeginFind() { m_iter = citer( &this->m_map, this->m_map.begin() ); }
- compatibility_iterator Next()
- {
- compatibility_iterator it = m_iter;
- if( m_iter )
- m_iter = m_iter->GetNext();
- return it;
- }
+ void BeginFind() { m_curr = NULL; m_currBucket = 0; }
+ Node* Next();
void Clear() { wxHashTableBase::Clear(); }
size_t GetCount() const { return wxHashTableBase::GetCount(); }
-private:
- compatibility_iterator m_iter;
-};
-
-#else // if !wxUSE_STL
-
-class WXDLLIMPEXP_BASE wxHashTable : public wxObject
-{
-public:
- int n;
- int current_position;
- wxNode *current_node;
-
- unsigned int key_type;
- wxList **hash_table;
-
- wxHashTable(int the_key_type = wxKEY_INTEGER,
- int size = wxHASH_SIZE_DEFAULT);
- ~wxHashTable();
-
- // copy ctor and assignment operator
- wxHashTable(const wxHashTable& table) : wxObject()
- { DoCopy(table); }
- wxHashTable& operator=(const wxHashTable& table)
- { Clear(); DoCopy(table); return *this; }
-
- void DoCopy(const wxHashTable& table);
-
- void Destroy();
-
- bool Create(int the_key_type = wxKEY_INTEGER,
- int size = wxHASH_SIZE_DEFAULT);
-
- // Note that there are 2 forms of Put, Get.
- // With a key and a value, the *value* will be checked
- // when a collision is detected. Otherwise, if there are
- // 2 items with a different value but the same key,
- // we'll retrieve the WRONG ONE. So where possible,
- // supply the required value along with the key.
- // In fact, the value-only versions make a key, and still store
- // the value. The use of an explicit key might be required
- // e.g. when combining several values into one key.
- // When doing that, it's highly likely we'll get a collision,
- // e.g. 1 + 2 = 3, 2 + 1 = 3.
-
- // key and value are NOT necessarily the same
- void Put(long key, long value, wxObject *object);
- void Put(long key, const wxChar *value, wxObject *object);
-
- // key and value are the same
- void Put(long value, wxObject *object);
- void Put(const wxChar *value, wxObject *object);
-
- // key and value not the same
- wxObject *Get(long key, long value) const;
- wxObject *Get(long key, const wxChar *value) const;
-
- // key and value are the same
- wxObject *Get(long value) const;
- wxObject *Get(const wxChar *value) const;
-
- // Deletes entry and returns data if found
- wxObject *Delete(long key);
- wxObject *Delete(const wxChar *key);
-
- wxObject *Delete(long key, int value);
- wxObject *Delete(long key, const wxChar *value);
-
- // Construct your own integer key from a string, e.g. in case
- // you need to combine it with something
- long MakeKey(const wxChar *string) const;
-
- // Way of iterating through whole hash table (e.g. to delete everything)
- // Not necessary, of course, if you're only storing pointers to
- // objects maintained separately
-
- void BeginFind();
- wxNode *Next();
-
- void DeleteContents(bool flag);
- void Clear();
-
- // Returns number of nodes
- size_t GetCount() const { return m_count; }
+protected:
+ // copy helper
+ void DoCopy( const wxHashTable& copy );
- typedef wxNode* compatibility_iterator;
+ // searches the next node starting from bucket bucketStart and sets
+ // m_curr to it and m_currBucket to its bucket
+ void GetNextNode( size_t bucketStart );
private:
- size_t m_count; // number of elements in the hashtable
- bool m_deleteContents;
+ virtual void DoDeleteContents( wxHashTableBase_Node* node );
- DECLARE_DYNAMIC_CLASS(wxHashTable)
-};
+ // current node
+ Node* m_curr;
-#endif
-
-#if wxUSE_STL
+ // bucket the current node belongs to
+ size_t m_currBucket;
+};
// defines a new type safe hash table which stores the elements of type eltype
// in lists of class listclass
public: \
hashclass(wxKeyType keyType = wxKEY_INTEGER, \
size_t size = wxHASH_SIZE_DEFAULT) \
- : wxHashTableBase(keyType, size) { } \
+ : wxHashTableBase() { Create(keyType, size); } \
\
- ~hashclass() { Destroy(); } \
+ virtual ~hashclass() { Destroy(); } \
\
- void Destroy() { m_map.clear(); } \
- void Put(long key, eltype *data) { DoPut(key, (void*)data); } \
- eltype *Get(long key) const { return (eltype*)DoGet(key); } \
- eltype *Delete(long key) { return (eltype*)DoDelete(key); } \
+ void Put(long key, eltype *data) { DoPut(key, key, (void*)data); } \
+ void Put(long lhash, long key, eltype *data) \
+ { DoPut(key, lhash, (void*)data); } \
+ eltype *Get(long key) const { return (eltype*)DoGet(key, key); } \
+ eltype *Get(long lhash, long key) const \
+ { return (eltype*)DoGet(key, lhash); } \
+ eltype *Delete(long key) { return (eltype*)DoDelete(key, key); } \
+ eltype *Delete(long lhash, long key) \
+ { return (eltype*)DoDelete(key, lhash); } \
+ private: \
+ virtual void DoDeleteContents( wxHashTableBase_Node* node ) \
+ { delete (eltype*)node->GetData(); } \
+ \
+ DECLARE_NO_COPY_CLASS(hashclass) \
}
-#else // if !wxUSE_STL
-
-#define _WX_DECLARE_HASH(eltype, listclass, hashclass, classexp) \
- classexp hashclass : public wxHashTableBase \
- { \
- public: \
- hashclass(wxKeyType keyType = wxKEY_INTEGER, \
- size_t size = wxHASH_SIZE_DEFAULT) \
- { Create(keyType, size); } \
- \
- ~hashclass() { Destroy(); } \
- \
- void Put(long key, long val, eltype *data) { DoPut(key, val, data); } \
- void Put(long key, eltype *data) { DoPut(key, key, data); } \
- \
- eltype *Get(long key, long value) const \
- { \
- wxNodeBase *node = GetNode(key, value); \
- return node ? ((listclass::Node *)node)->GetData() : (eltype *)0; \
- } \
- eltype *Get(long key) const { return Get(key, key); } \
- \
- eltype *Delete(long key, long value) \
- { \
- eltype *data; \
- \
- wxNodeBase *node = GetNode(key, value); \
- if ( node ) \
- { \
- data = ((listclass::Node *)node)->GetData(); \
- \
- delete node; \
- m_count--; \
- } \
- else \
- { \
- data = (eltype *)0; \
- } \
- \
- return data; \
- } \
- eltype *Delete(long key) { return Delete(key, key); } \
- \
- protected: \
- void DoPut(long key, long value, eltype *data) \
- { \
- size_t slot = (size_t)abs((int)(key % (long)m_hashSize)); \
- \
- if ( !m_hashTable[slot] ) \
- { \
- m_hashTable[slot] = new listclass(m_keyType); \
- if ( m_deleteContents ) \
- m_hashTable[slot]->DeleteContents(TRUE); \
- } \
- \
- ((listclass *)m_hashTable[slot])->Append(value, data); \
- m_count++; \
- } \
- \
- DECLARE_NO_COPY_CLASS(hashclass) \
- }
-
-#endif
// this macro is to be used in the user code
#define WX_DECLARE_HASH(el, list, hash) \
// and this one does exactly the same thing but should be used inside the
// library
#define WX_DECLARE_EXPORTED_HASH(el, list, hash) \
- _WX_DECLARE_HASH(el, list, hash, class WXDLLEXPORT)
+ _WX_DECLARE_HASH(el, list, hash, class WXDLLIMPEXP_CORE)
#define WX_DECLARE_USER_EXPORTED_HASH(el, list, hash, usergoo) \
_WX_DECLARE_HASH(el, list, hash, class usergoo)
(hash).Clear(); \
}
-#endif
- // _WX_HASH_H__
+#endif // _WX_HASH_H__
projects / wxWidgets.git / blobdiff