mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-09-01 22:45:18 +00:00
[#3831] C++17 clang fixes
This commit is contained in:
committed by
Andrei Pavel
parent
f22c691a1f
commit
c871f5e97e
@@ -242,7 +242,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
/// @brief Convenience macros for invoking runOrConfig()
|
/// @brief Convenience macros for invoking runOrConfig()
|
||||||
#define RUN_CONFIG_OK(a) (runConfigOrFail(a, NO_ERROR, ""))
|
#define RUN_CONFIG_OK(a) (static_cast<void>(runConfigOrFail(a, NO_ERROR, "")))
|
||||||
#define SYNTAX_ERROR(a,b) ASSERT_TRUE(runConfigOrFail(a,SYNTAX_ERROR,b))
|
#define SYNTAX_ERROR(a,b) ASSERT_TRUE(runConfigOrFail(a,SYNTAX_ERROR,b))
|
||||||
#define LOGIC_ERROR(a,b) ASSERT_TRUE(runConfigOrFail(a,LOGIC_ERROR,b))
|
#define LOGIC_ERROR(a,b) ASSERT_TRUE(runConfigOrFail(a,LOGIC_ERROR,b))
|
||||||
|
|
||||||
|
@@ -647,7 +647,7 @@ TEST_F(D2ProcessTest, notLoopbackTest) {
|
|||||||
// Note we don't care nor can we predict if this
|
// Note we don't care nor can we predict if this
|
||||||
// succeeds or fails. The address and port may or may
|
// succeeds or fails. The address and port may or may
|
||||||
// not be valid on the test host.
|
// not be valid on the test host.
|
||||||
runWithConfig(config);
|
static_cast<void>(runWithConfig(config));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @brief Used to permit visual inspection of logs to ensure
|
/// @brief Used to permit visual inspection of logs to ensure
|
||||||
|
@@ -219,7 +219,7 @@ DirectClientTest::createClientMessage(const Pkt4Ptr& msg,
|
|||||||
// local and remote address are set like it was a message sent from the
|
// local and remote address are set like it was a message sent from the
|
||||||
// directly connected client.
|
// directly connected client.
|
||||||
Pkt4Ptr received;
|
Pkt4Ptr received;
|
||||||
createPacketFromBuffer(msg, received);
|
static_cast<void>(createPacketFromBuffer(msg, received));
|
||||||
received->setIface(iface);
|
received->setIface(iface);
|
||||||
received->setIndex(ifindex);
|
received->setIndex(ifindex);
|
||||||
received->setLocalAddr(IOAddress("255.255.255.255"));
|
received->setLocalAddr(IOAddress("255.255.255.255"));
|
||||||
|
@@ -260,7 +260,7 @@ TEST_F(DStubCfgMgrTest, simpleParseConfig) {
|
|||||||
string config = "{ \"bool_test\": true , \n"
|
string config = "{ \"bool_test\": true , \n"
|
||||||
" \"uint32_test\": 77 , \n"
|
" \"uint32_test\": 77 , \n"
|
||||||
" \"string_test\": \"hmmm chewy\" }";
|
" \"string_test\": \"hmmm chewy\" }";
|
||||||
ASSERT_NO_THROW(fromJSON(config));
|
ASSERT_NO_THROW(static_cast<void>(fromJSON(config)));
|
||||||
|
|
||||||
answer_ = cfg_mgr_->simpleParseConfig(config_set_, false);
|
answer_ = cfg_mgr_->simpleParseConfig(config_set_, false);
|
||||||
EXPECT_TRUE(checkAnswer(0));
|
EXPECT_TRUE(checkAnswer(0));
|
||||||
@@ -272,7 +272,7 @@ TEST_F(DStubCfgMgrTest, simpleParseConfigWithCallback) {
|
|||||||
string config = "{ \"bool_test\": true , \n"
|
string config = "{ \"bool_test\": true , \n"
|
||||||
" \"uint32_test\": 77 , \n"
|
" \"uint32_test\": 77 , \n"
|
||||||
" \"string_test\": \"hmmm chewy\" }";
|
" \"string_test\": \"hmmm chewy\" }";
|
||||||
ASSERT_NO_THROW(fromJSON(config));
|
ASSERT_NO_THROW(static_cast<void>(fromJSON(config)));
|
||||||
|
|
||||||
answer_ = cfg_mgr_->simpleParseConfig(config_set_, false,
|
answer_ = cfg_mgr_->simpleParseConfig(config_set_, false,
|
||||||
[]() {
|
[]() {
|
||||||
|
Reference in New Issue
Block a user