projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(re)enable Cancel button in Resume()
[wxWidgets.git]
/
include
/
wx
/
hashmap.h
diff --git
a/include/wx/hashmap.h
b/include/wx/hashmap.h
index 1715c403f84624650bc9a6789587e171eac5184b..801a03614008c9cdd08b41b7543f0f3c44ca215c 100644
(file)
--- a/
include/wx/hashmap.h
+++ b/
include/wx/hashmap.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: hashmap.
cpp
+// Name: hashmap.
h
// Purpose: wxHashMap class
// Author: Mattia Barbon
// Modified by:
// Purpose: wxHashMap class
// Author: Mattia Barbon
// Modified by:
@@
-16,7
+16,7
@@
#pragma interface "hashmap.h"
#endif
#pragma interface "hashmap.h"
#endif
-#include
<wx/string.h>
+#include
"wx/string.h"
// private
struct WXDLLEXPORT _wxHashTable_NodeBase
// private
struct WXDLLEXPORT _wxHashTable_NodeBase
@@
-363,9
+363,15
@@
public: \
#define _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, PAIR_T, CLASSNAME, CLASSEXP ) \
CLASSEXP CLASSNAME \
{ \
#define _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, PAIR_T, CLASSNAME, CLASSEXP ) \
CLASSEXP CLASSNAME \
{ \
+ typedef KEY_T key_type; \
+ typedef PAIR_T pair_type; \
+ typedef const key_type const_key_type; \
+ typedef const pair_type const_pair_type; \
+ typedef const_key_type& const_key_reference; \
+ typedef const_pair_type& const_pair_reference; \
public: \
CLASSNAME() { } \
public: \
CLASSNAME() { } \
-
KEY_T operator()( PAIR_T pair ) const { return pair.first; }
\
+
const_key_reference operator()( const_pair_reference pair ) const { return pair.first; }
\
\
/* the dummy assignment operator is needed to suppress compiler */ \
/* warnings from hash table class' operator=(): gcc complains about */ \
\
/* the dummy assignment operator is needed to suppress compiler */ \
/* warnings from hash table class' operator=(): gcc complains about */ \