Merge tag 'upstream/2.2.0'

Upstream version 2.2.0

1 files changed, 3 insertions, 0 deletions

diff --git a/src/trie.hpp b/src/trie.hpp
index dbf1cb1..7b1b62c 100644
--- a/src/trie.hpp
+++ b/src/trie.hpp
@@ -1,5 +1,6 @@
 /*
     Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2011-2012 Spotify AB
     Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
@@ -40,10 +41,12 @@ namespace zmq
         bool check (unsigned char *data_, size_t size_);
 
     private:
+        bool is_redundant () const;
 
         uint32_t refcnt;
         unsigned char min;
         unsigned short count;
+        unsigned short live_nodes;
         union {
             class trie_t *node;
             class trie_t **table;