Index: src/network/test/packet-test-suite.cc |
=================================================================== |
--- a/src/network/test/packet-test-suite.cc |
+++ b/src/network/test/packet-test-suite.cc |
@@ -283,6 +283,7 @@ |
return N; |
} |
virtual void Print (std::ostream &os) const { |
+ NS_UNUSED (os); |
} |
ATestHeader () |
: ATestHeaderBase () {} |
@@ -371,6 +372,7 @@ |
return N; |
} |
virtual void Print (std::ostream &os) const { |
+ NS_UNUSED (os); |
} |
ATestTrailer () |
: ATestTrailerBase () {} |
@@ -611,34 +613,34 @@ |
} |
{ |
- Packet p; |
+ Packet p1; |
ATestTag<10> a; |
- p.AddPacketTag (a); |
- NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (a), true, "trivial"); |
+ p1.AddPacketTag (a); |
+ NS_TEST_EXPECT_MSG_EQ (p1.PeekPacketTag (a), true, "trivial"); |
ATestTag<11> b; |
- p.AddPacketTag (b); |
- NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (b), true, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (a), true, "trivial"); |
- Packet copy = p; |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (b), true, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (a), true, "trivial"); |
+ p1.AddPacketTag (b); |
+ NS_TEST_EXPECT_MSG_EQ (p1.PeekPacketTag (b), true, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (p1.PeekPacketTag (a), true, "trivial"); |
+ Packet copy1 = p1; |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (b), true, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (a), true, "trivial"); |
ATestTag<12> c; |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (c), false, "trivial"); |
- copy.AddPacketTag (c); |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (c), true, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (b), true, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (a), true, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (c), false, "trivial"); |
- copy.RemovePacketTag (b); |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (b), false, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (b), true, "trivial"); |
- p.RemovePacketTag (a); |
- NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (a), false, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (a), true, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (c), false, "trivial"); |
- NS_TEST_EXPECT_MSG_EQ (copy.PeekPacketTag (c), true, "trivial"); |
- p.RemoveAllPacketTags (); |
- NS_TEST_EXPECT_MSG_EQ (p.PeekPacketTag (b), false, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (c), false, "trivial"); |
+ copy1.AddPacketTag (c); |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (c), true, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (b), true, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (a), true, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (p1.PeekPacketTag (c), false, "trivial"); |
+ copy1.RemovePacketTag (b); |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (b), false, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (p1.PeekPacketTag (b), true, "trivial"); |
+ p1.RemovePacketTag (a); |
+ NS_TEST_EXPECT_MSG_EQ (p1.PeekPacketTag (a), false, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (a), true, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (p1.PeekPacketTag (c), false, "trivial"); |
+ NS_TEST_EXPECT_MSG_EQ (copy1.PeekPacketTag (c), true, "trivial"); |
+ p1.RemoveAllPacketTags (); |
+ NS_TEST_EXPECT_MSG_EQ (p1.PeekPacketTag (b), false, "trivial"); |
} |
{ |