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

avoid GCC warning about type-punned pointer breaking strict aliasing rules

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-01-14 18:15:28 +00:00
parent 0edfe8f7e3
commit 872051d89b
2 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
include/wx/hashmap.h
View File

@@ -49,9 +49,9 @@ typedef int ptrdiff_t;
// private
struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase
{
_wxHashTable_NodeBase() : m_nxt(0) {}
_wxHashTable_NodeBase() : m_next(NULL) {}
_wxHashTable_NodeBase* m_nxt;
_wxHashTable_NodeBase* m_next;
// Cannot do this:
// DECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase)
@@ -75,7 +75,7 @@ protected:
for( size_t i = 0; i < buckets; ++i )
if( table[i] )
return table[i];
return 0;
return NULL;
}
// as static const unsigned prime_count = 31 but works with all compilers
@@ -123,11 +123,10 @@ public: \
typedef const KEY_T const_key_type; \
typedef const VALUE_T const_mapped_type; \
public: \
struct Node; \
typedef KEY_EX_T key_extractor; \
typedef CLASSNAME Self; \
protected: \
Node** m_table; \
_wxHashTable_NodeBase** m_table; \
size_t m_tableBuckets; \
size_t m_items; \
hasher m_hasher; \
@@ -139,7 +138,7 @@ public: \
public: \
Node( const value_type& value ) \
: m_value( value ) {} \
Node* m_next() { return (Node*)this->m_nxt; } \
Node* next() { return wx_static_cast(Node*, m_next); } \
\
value_type m_value; \
}; \
@@ -147,7 +146,7 @@ public: \
protected: \
static void DeleteNode( _wxHashTable_NodeBase* node ) \
{ \
delete (Node*)node; \
delete wx_static_cast(Node*, node); \
} \
public: \
/* */ \
@@ -159,7 +158,7 @@ public: \
Node* m_node; \
Self* m_ht; \
\
Iterator() : m_node(0), m_ht(0) {} \
Iterator() : m_node(NULL), m_ht(NULL) {} \
Iterator( Node* node, const Self* ht ) \
: m_node(node), m_ht(wx_const_cast(Self*, ht)) {} \
bool operator ==( const Iterator& it ) const \
@@ -173,14 +172,14 @@ public: \
for( size_type i = bucket + 1; i < m_ht->m_tableBuckets; ++i ) \
{ \
if( m_ht->m_table[i] ) \
return m_ht->m_table[i]; \
return wx_static_cast(Node*, m_ht->m_table[i]); \
} \
return 0; \
return NULL; \
} \
\
void PlusPlus() \
{ \
Node* next = m_node->m_next(); \
Node* next = m_node->next(); \
m_node = next ? next : GetNextNode(); \
} \
}; \
@@ -220,11 +219,11 @@ public: \
m_equals( k_eq ), \
m_getKey( k_ex ) \
{ \
m_table = (Node**)AllocTable( m_tableBuckets ); \
m_table = (_wxHashTable_NodeBase**)AllocTable(m_tableBuckets); \
} \
\
CLASSNAME( const Self& ht ) \
: m_table( 0 ), \
: m_table(NULL), \
m_tableBuckets( 0 ), \
m_items( ht.m_items ), \
m_hasher( ht.m_hasher ), \
@@ -262,8 +261,7 @@ public: \
/* shrink it ( perhaps it should ) */ \
void clear() \
{ \
DeleteNodes( m_tableBuckets, (_wxHashTable_NodeBase**)m_table, \
DeleteNode ); \
DeleteNodes(m_tableBuckets, m_table, DeleteNode); \
m_items = 0; \
} \
\
@@ -271,23 +269,23 @@ public: \
size_type max_size() const { return size_type(-1); } \
bool empty() const { return size() == 0; } \
\
const_iterator end() const { return const_iterator( 0, this ); } \
iterator end() { return iterator( 0, this ); } \
const_iterator end() const { return const_iterator(NULL, this); } \
iterator end() { return iterator(NULL, this); } \
const_iterator begin() const \
{ return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \
{ return const_iterator(wx_static_cast(Node*, GetFirstNode(m_tableBuckets, m_table)), this); } \
iterator begin() \
{ return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \
{ return iterator(wx_static_cast(Node*, GetFirstNode(m_tableBuckets, m_table)), this); } \
\
size_type erase( const const_key_type& key ) \
{ \
Node** node = GetNodePtr( key ); \
_wxHashTable_NodeBase** node = GetNodePtr(key); \
\
if( !node ) \
return 0; \
\
--m_items; \
Node* temp = (*node)->m_next(); \
delete *node; \
_wxHashTable_NodeBase* temp = (*node)->m_next; \
delete wx_static_cast(Node*, *node); \
(*node) = temp; \
if( SHOULD_SHRINK( m_tableBuckets, m_items ) ) \
ResizeTable( GetPreviousPrime( (unsigned long) m_tableBuckets ) - 1 ); \
@@ -306,7 +304,7 @@ protected: \
{ \
const const_key_type& key = m_getKey( value ); \
size_t bucket = m_hasher( key ) % m_tableBuckets; \
Node* node = m_table[bucket]; \
Node* node = wx_static_cast(Node*, m_table[bucket]); \
\
while( node ) \
{ \
@@ -315,7 +313,7 @@ protected: \
created = false; \
return node; \
} \
node = node->m_next(); \
node = node->next(); \
} \
created = true; \
return CreateNode( value, bucket); \
@@ -323,7 +321,7 @@ protected: \
Node * CreateNode( const value_type& value, size_t bucket ) \
{\
Node* node = new Node( value ); \
node->m_nxt = m_table[bucket]; \
node->m_next = m_table[bucket]; \
m_table[bucket] = node; \
\
/* must be after the node is inserted */ \
@@ -339,17 +337,16 @@ protected: \
}\
\
/* returns NULL if not found */ \
Node** GetNodePtr( const const_key_type& key ) const \
_wxHashTable_NodeBase** GetNodePtr(const const_key_type& key) const \
{ \
size_t bucket = m_hasher( key ) % m_tableBuckets; \
Node** node = &m_table[bucket]; \
_wxHashTable_NodeBase** node = &m_table[bucket]; \
\
while( *node ) \
{ \
if( m_equals( m_getKey( (*node)->m_value ), key ) ) \
if (m_equals(m_getKey(wx_static_cast(Node*, *node)->m_value), key)) \
return node; \
/* Tell the compiler to not do any strict-aliasing assumptions with a void cast? Can we make such a runtime guarantee? */ \
node = (Node**)&(*node)->m_nxt; \
node = &(*node)->m_next; \
} \
\
return NULL; \
@@ -360,28 +357,28 @@ protected: \
Node* GetNode( const const_key_type& key ) const \
{ \
size_t bucket = m_hasher( key ) % m_tableBuckets; \
Node* node = m_table[bucket]; \
Node* node = wx_static_cast(Node*, m_table[bucket]); \
\
while( node ) \
{ \
if( m_equals( m_getKey( node->m_value ), key ) ) \
return node; \
node = node->m_next(); \
node = node->next(); \
} \
\
return 0; \
return NULL; \
} \
\
void ResizeTable( size_t newSize ) \
{ \
newSize = GetNextPrime( (unsigned long)newSize ); \
Node** srcTable = m_table; \
_wxHashTable_NodeBase** srcTable = m_table; \
size_t srcBuckets = m_tableBuckets; \
m_table = (Node**)AllocTable( newSize ); \
m_table = (_wxHashTable_NodeBase**)AllocTable( newSize ); \
m_tableBuckets = newSize; \
\
CopyHashTable( (_wxHashTable_NodeBase**)srcTable, srcBuckets, \
this, (_wxHashTable_NodeBase**)m_table, \
CopyHashTable( srcTable, srcBuckets, \
this, m_table, \
(BucketFromNode)GetBucketForNode,\
(ProcessNode)&DummyProcessNode ); \
FreeTable(srcTable); \
@@ -391,9 +388,9 @@ protected: \
void HashCopy( const Self& ht ) \
{ \
ResizeTable( ht.size() ); \
CopyHashTable( (_wxHashTable_NodeBase**)ht.m_table, ht.m_tableBuckets,\
CopyHashTable( ht.m_table, ht.m_tableBuckets, \
(_wxHashTableBase2*)this, \
(_wxHashTable_NodeBase**)m_table, \
m_table, \
(BucketFromNode)GetBucketForNode, \
(ProcessNode)CopyNode ); \
} \