diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-15 21:17:42 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-15 21:17:42 +0000 |
| commit | bfdc366037690c74d1e6b73fc33e2f73842ed793 (patch) | |
| tree | eddffbfb10fcdcda6d2afd3bf17e4a9aaa2a8d54 /src/or/circuitlist.c | |
| parent | ca32b4d5b51b95fac2b030874025ac4c19be8414 (diff) | |
| download | tor-bfdc366037690c74d1e6b73fc33e2f73842ed793.tar.gz tor-bfdc366037690c74d1e6b73fc33e2f73842ed793.zip | |
r12763@catbus: nickm | 2007-05-15 05:29:33 -0400
Make --enable-gcc-warnings happy on the upcoming gcc 4.2
svn:r10195
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 5580bd0394..44f0566596 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1116,16 +1116,20 @@ assert_circuit_ok(const circuit_t *c) edge_connection_t *conn; const or_circuit_t *or_circ = NULL; const origin_circuit_t *origin_circ = NULL; + circuit_t *nonconst_circ; tor_assert(c); tor_assert(c->magic == ORIGIN_CIRCUIT_MAGIC || c->magic == OR_CIRCUIT_MAGIC); tor_assert(c->purpose >= _CIRCUIT_PURPOSE_MIN && c->purpose <= _CIRCUIT_PURPOSE_MAX); + /* Having a separate variable for this pleases GCC 4.2 in ways I hop I never + * understand. -NM. */ + nonconst_circ = (circuit_t*) c; if (CIRCUIT_IS_ORIGIN(c)) - origin_circ = TO_ORIGIN_CIRCUIT((circuit_t*)c); + origin_circ = TO_ORIGIN_CIRCUIT(nonconst_circ); else - or_circ = TO_OR_CIRCUIT((circuit_t*)c); + or_circ = TO_OR_CIRCUIT(nonconst_circ); if (c->n_conn) { tor_assert(!memcmp(c->n_conn->identity_digest, c->n_conn_id_digest, |