SunnyQjm/NFD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

table: pit::FaceRecord stores Face& instead of shared_ptr

Browse Source 
refs #3164

Change-Id: Ib23ab2341a37213fee791f2070f13b76da851d53
This commit is contained in:
Junxiao Shi
2016-08-01 21:45:11 +00:00
parent 02b73f5705
commit 9cff779038
23 changed files with 193 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/table/pit-entry.cpp
+8 -8
View File
@@ -38,14 +38,14 @@ InRecordCollection::iterator
Entry::getInRecord(const Face& face)
{
return std::find_if(m_inRecords.begin(), m_inRecords.end(),
[&face] (const InRecord& inRecord) { return inRecord.getFace().get() == &face; });
[&face] (const InRecord& inRecord) { return &inRecord.getFace() == &face; });
}
InRecordCollection::iterator
Entry::insertOrUpdateInRecord(shared_ptr<Face> face, const Interest& interest)
Entry::insertOrUpdateInRecord(Face& face, const Interest& interest)
{
auto it = std::find_if(m_inRecords.begin(), m_inRecords.end(),
[&face] (const InRecord& inRecord) { return inRecord.getFace() == face; });
[&face] (const InRecord& inRecord) { return &inRecord.getFace() == &face; });
if (it == m_inRecords.end()) {
m_inRecords.emplace_front(face);
it = m_inRecords.begin();
@@ -59,7 +59,7 @@ void
Entry::deleteInRecord(const Face& face)
{
auto it = std::find_if(m_inRecords.begin(), m_inRecords.end(),
[&face] (const InRecord& inRecord) { return inRecord.getFace().get() == &face; });
[&face] (const InRecord& inRecord) { return &inRecord.getFace() == &face; });
if (it != m_inRecords.end()) {
m_inRecords.erase(it);
}
@@ -75,14 +75,14 @@ OutRecordCollection::iterator
Entry::getOutRecord(const Face& face)
{
return std::find_if(m_outRecords.begin(), m_outRecords.end(),
[&face] (const OutRecord& outRecord) { return outRecord.getFace().get() == &face; });
[&face] (const OutRecord& outRecord) { return &outRecord.getFace() == &face; });
}
OutRecordCollection::iterator
Entry::insertOrUpdateOutRecord(shared_ptr<Face> face, const Interest& interest)
Entry::insertOrUpdateOutRecord(Face& face, const Interest& interest)
{
auto it = std::find_if(m_outRecords.begin(), m_outRecords.end(),
[&face] (const OutRecord& outRecord) { return outRecord.getFace() == face; });
[&face] (const OutRecord& outRecord) { return &outRecord.getFace() == &face; });
if (it == m_outRecords.end()) {
m_outRecords.emplace_front(face);
it = m_outRecords.begin();
@@ -96,7 +96,7 @@ void
Entry::deleteOutRecord(const Face& face)
{
auto it = std::find_if(m_outRecords.begin(), m_outRecords.end(),
[&face] (const OutRecord& outRecord) { return outRecord.getFace().get() == &face; });
[&face] (const OutRecord& outRecord) { return &outRecord.getFace() == &face; });
if (it != m_outRecords.end()) {
m_outRecords.erase(it);
}