commit 8140b7a818a799dfa43f47c13edeb74f1f0daa20 Author: Zack Weinberg zackw@cmu.edu Date: Mon Apr 16 14:49:44 2012 -0700

Add a cast to make gcc 4.4 happy. --- src/protocol/chop.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/protocol/chop.cc b/src/protocol/chop.cc index ad8ac9f..dac4ea2 100644 --- a/src/protocol/chop.cc +++ b/src/protocol/chop.cc @@ -1158,7 +1158,7 @@ chop_conn_t::recv_handshake() sizeof circuit_id) != sizeof circuit_id) return -1;

- chop_circuit_table::value_type in(circuit_id, 0); + chop_circuit_table::value_type in(circuit_id, (chop_circuit_t *)0); std::pair<chop_circuit_table::iterator, bool> out = this->config->circuits.insert(in); chop_circuit_t *ck;