From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 22 Dec 2011 17:38:26 +0000 (-0800)
Subject: [master] workaround for cppcheck failure: avoid using an 'immediately
X-Git-Tag: trac2351_base~299^2~14^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6718ccfa5f7ca499473590aa0a8618ec7adca46e;p=thirdparty%2Fkea.git

[master] workaround for cppcheck failure: avoid using an 'immediately
destructed scoped object'
---

diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index 95c0dbd337..b9f2667692 100644
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -816,9 +816,9 @@ TEST_F(ForwardTest, badPop) {
     sock.reset(-1);
     // The passed one should have been closed, too, so we should be able
     // to bind a new socket to the same port.
-    ScopedSocket(createSocket(AF_INET, SOCK_DGRAM, IPPROTO_UDP,
-                              getSockAddr("127.0.0.1", TEST_PORT),
-                              false));
+    sock.reset(createSocket(AF_INET, SOCK_DGRAM, IPPROTO_UDP,
+                            getSockAddr("127.0.0.1", TEST_PORT),
+                            false));
 }
 
 TEST(SocketSessionTest, badValue) {