Commit 427eb464 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

r15842@catbus: nickm | 2007-10-16 09:58:33 -0400 

 Backport warning-suppression for gcc 4.2.


svn:r11981
parent a58ba03b

src/or/circuitlist.c

+9 −4
Original line number Diff line number Diff line
@@ -1056,10 +1056,15 @@ assert_circuit_ok(const circuit_t *c) 
  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 hope I

     * never understand. -NM. */

    circuit_t *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,