--- a/src/devices/mesh/dot11s/ie-dot11s-perr.cc Thu Jul 09 00:07:53 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-perr.cc Thu Jul 09 14:07:14 2009 +0400
@@ -119,20 +119,6 @@
}
}
void
-IePerr::Merge(const IePerr perr)
-{
- std::vector<FailedDestination> to_merge = perr.GetAddressUnitVector ();
- for (std::vector<FailedDestination>::iterator i = to_merge.begin (); i != to_merge.end(); i ++)
- {
- bool should_add = true;
- for (std::vector<FailedDestination>::iterator j = m_addressUnits.begin (); j != m_addressUnits.end(); j ++)
- if ((i->destination == j->destination) && (i->seqnum <= j->seqnum))
- should_add = false;
- if(should_add)
- AddAddressUnit (*i);
- }
-}
-void
IePerr::ResetPerr ()
{
m_addressUnits.clear ();
@@ -178,10 +164,6 @@
dest.seqnum = 3;
a.AddAddressUnit(dest);
- IePerr b = a;
- b.Merge(a);
- NS_TEST_ASSERT_EQUAL (a, b);
-
result = result && TestRoundtripSerialization (a);
return result;
}