Packets/DefaultBundle: Use push_back_space() return value

[senf.git] / senf / Packets / DefaultBundle / IPv6Extensions.test.cc

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
index 380b696..fde52a3 100644 (file)
--- a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
+++ b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
@@ -266,29 +266,31 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)
     pext->headerLength() = 0u;
     {
         senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC(pext->options() );
-        
-        optC.push_back_space();
-        senf::IPv6GenericOptionTLVParser opt = optC.back().init<senf::IPv6GenericOptionTLVParser>();
-        opt.altAction() = 0u;
-        opt.changeFlag() = 0u;
-        opt.optionType() = 5u;
-        unsigned char val[] = {0x00, 0x00};
-        opt.setPayload(val);
-        
-        optC.push_back_space();
-        opt = optC.back().init<senf::IPv6GenericOptionTLVParser>();
-        opt.altAction() = 0u;
-        opt.changeFlag() = 0u;
-        opt.optionType() = 2u;
+        {
+            senf::IPv6GenericOptionTLVParser opt (
+                optC.push_back_space().init<senf::IPv6GenericOptionTLVParser>());
+            opt.altAction() = 0u;
+            opt.changeFlag() = 0u;
+            opt.optionType() = 5u;
+            unsigned char val[] = {0x00, 0x00};
+            opt.setPayload(val);
+        }
+        {
+            senf::IPv6GenericOptionTLVParser opt (
+                optC.push_back_space().init<senf::IPv6GenericOptionTLVParser>());
+            opt.altAction() = 0u;
+            opt.changeFlag() = 0u;
+            opt.optionType() = 2u;
+        }
     }
     senf::ICMPv6Packet icmp (senf::ICMPv6Packet::createAfter (pext));
     icmp->type() = 0x8f;
     icmp->code() = 0u;
     ip.finalizeAll();
     SENF_CHECK_NO_THROW( ip.dump(oss) );
-    BOOST_CHECK_EQUAL_COLLECTIONS(
-            HopByHop_packetData, HopByHop_packetData+sizeof(HopByHop_packetData),
-            ip.data().begin(), ip.data().end() );
+    SENF_CHECK_EQUAL_COLLECTIONS(
+        HopByHop_packetData, HopByHop_packetData+sizeof(HopByHop_packetData),
+        ip.data().begin(), ip.data().end() );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////