From ab763c38d9e7051612c7853e7452b86045a7fc1d Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Tue, 30 Aug 2016 19:59:24 -0400 Subject: [PATCH] use shared pointers --- NetDb.cpp | 6 +++--- NetDb.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NetDb.cpp b/NetDb.cpp index e1d49c5c..d0a75c3a 100644 --- a/NetDb.cpp +++ b/NetDb.cpp @@ -342,7 +342,7 @@ namespace data { std::unique_lock lock(m_RouterInfosMutex); for ( const auto & item : m_RouterInfos ) - v(*item.second); + v(item.second); } size_t NetDb::VisitRandomRouterInfos(RouterInfoFilter filter, RouterInfoVisitor v, size_t n) @@ -359,7 +359,7 @@ namespace data if(i >= idx) // are we at the random start point? { // yes, check if we want this one - if(filter(*it.second)) + if(filter(it.second)) { // we have a match --n; @@ -383,7 +383,7 @@ namespace data // visit the ones we found size_t visited = 0; for(const auto & ri : found ) { - v(*ri); + v(ri); ++visited; } return visited; diff --git a/NetDb.h b/NetDb.h index 294e1c83..d8ee148a 100644 --- a/NetDb.h +++ b/NetDb.h @@ -38,10 +38,10 @@ namespace data typedef std::function)> LeaseSetVisitor; /** function for visiting a router info we have locally */ - typedef std::function RouterInfoVisitor; + typedef std::function)> RouterInfoVisitor; /** function for visiting a router info and determining if we want to use it */ - typedef std::function RouterInfoFilter; + typedef std::function)> RouterInfoFilter; class NetDb {