diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-09-02 08:07:40 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-09-02 08:07:40 +0200 |
| commit | 0a1f7e3524338690551c04ebfccd896a0b96f399 (patch) | |
| tree | 1f2c533e9394cd8f21977b252c11abf027bd772a /src/trie.hpp | |
| parent | a81a37399b2ab4143aedf3ff4c442655b9e7e9b7 (diff) | |
| parent | 14853c2db528b3fd6eed84786053549e71f61bb7 (diff) | |
Merge branch 'maint'
* maint:
Prior to this patch prefix_tree asserts.
Fix for signaler_t on HP-UX and AIX platforms
Mikael Kjaer added to AUTHORS
Conflicts:
src/trie.cpp
Diffstat (limited to 'src/trie.hpp')
| -rw-r--r-- | src/trie.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/trie.hpp b/src/trie.hpp index c085a41..08b2eac 100644 --- a/src/trie.hpp +++ b/src/trie.hpp @@ -42,7 +42,7 @@ namespace zmq uint32_t refcnt; unsigned char min; - unsigned char count; + unsigned short count; union { class trie_t *node; class trie_t **table; |