From d52eb9ed19474c34fc037cfb883c7a91929bd20b Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 16 Jan 2012 22:48:43 +0000 Subject: [PATCH] fixed release asserts issue in kademlia code --- src/kademlia/find_data.cpp | 2 +- src/kademlia/node.cpp | 4 ++-- src/kademlia/refresh.cpp | 2 +- src/kademlia/traversal_algorithm.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kademlia/find_data.cpp b/src/kademlia/find_data.cpp index 9e7d97f15..1ee9fb17b 100644 --- a/src/kademlia/find_data.cpp +++ b/src/kademlia/find_data.cpp @@ -196,7 +196,7 @@ observer_ptr find_data::new_observer(void* ptr , udp::endpoint const& ep, node_id const& id) { observer_ptr o(new (ptr) find_data_observer(this, ep, id)); -#ifdef TORRENT_DEBUG +#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS o->m_in_constructor = false; #endif return o; diff --git a/src/kademlia/node.cpp b/src/kademlia/node.cpp index 86c3b33c3..58c22c247 100644 --- a/src/kademlia/node.cpp +++ b/src/kademlia/node.cpp @@ -273,7 +273,7 @@ namespace void* ptr = node.m_rpc.allocate_observer(); if (ptr == 0) return; observer_ptr o(new (ptr) announce_observer(algo, i->first.ep(), i->first.id)); -#ifdef TORRENT_DEBUG +#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS o->m_in_constructor = false; #endif entry e; @@ -310,7 +310,7 @@ void node_impl::add_node(udp::endpoint node) boost::intrusive_ptr algo( new traversal_algorithm(*this, (node_id::min)())); observer_ptr o(new (ptr) null_observer(algo, node, node_id(0))); -#ifdef TORRENT_DEBUG +#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS o->m_in_constructor = false; #endif entry e; diff --git a/src/kademlia/refresh.cpp b/src/kademlia/refresh.cpp index 692ea4822..05b1aa6eb 100644 --- a/src/kademlia/refresh.cpp +++ b/src/kademlia/refresh.cpp @@ -62,7 +62,7 @@ observer_ptr refresh::new_observer(void* ptr , udp::endpoint const& ep, node_id const& id) { observer_ptr o(new (ptr) find_data_observer(this, ep, id)); -#ifdef TORRENT_DEBUG +#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS o->m_in_constructor = false; #endif return o; diff --git a/src/kademlia/traversal_algorithm.cpp b/src/kademlia/traversal_algorithm.cpp index 4ec62874b..338af5664 100644 --- a/src/kademlia/traversal_algorithm.cpp +++ b/src/kademlia/traversal_algorithm.cpp @@ -53,7 +53,7 @@ observer_ptr traversal_algorithm::new_observer(void* ptr , udp::endpoint const& ep, node_id const& id) { observer_ptr o(new (ptr) null_observer(boost::intrusive_ptr(this), ep, id)); -#ifdef TORRENT_DEBUG +#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS o->m_in_constructor = false; #endif return o;