Commit de3fcb07 authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] Fixed merge errors and some trivial warnings

parent fc9cd4b2
...@@ -3905,7 +3905,8 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3905,7 +3905,8 @@ const char* UNPARSED_CONFIGS[] = {
" \"hooks-libraries\": [ ],\n" " \"hooks-libraries\": [ ],\n"
" \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n" " \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
" \"interfaces-config\": {\n" " \"interfaces-config\": {\n"
" \"interfaces\": [ \"*\" ]\n" " \"interfaces\": [ \"*\" ],\n"
" \"re-detect\": false\n"
" },\n" " },\n"
" \"lease-database\": {\n" " \"lease-database\": {\n"
" \"type\": \"memfile\"\n" " \"type\": \"memfile\"\n"
...@@ -3987,7 +3988,8 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3987,7 +3988,8 @@ const char* UNPARSED_CONFIGS[] = {
" \"hooks-libraries\": [ ],\n" " \"hooks-libraries\": [ ],\n"
" \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n" " \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
" \"interfaces-config\": {\n" " \"interfaces-config\": {\n"
" \"interfaces\": [ \"*\" ]\n" " \"interfaces\": [ \"*\" ],\n"
" \"re-detect\": false\n"
" },\n" " },\n"
" \"lease-database\": {\n" " \"lease-database\": {\n"
" \"type\": \"memfile\"\n" " \"type\": \"memfile\"\n"
...@@ -6157,7 +6159,6 @@ public: ...@@ -6157,7 +6159,6 @@ public:
TEST_P(Dhcp4GetConfigTest, run) { TEST_P(Dhcp4GetConfigTest, run) {
// configurations have not been extracted yet // configurations have not been extracted yet
if (max_config_counter == 0) { if (max_config_counter == 0) {
std::cout << "#### max_config_counter=0, aborting" << std::endl;
return; return;
} }
...@@ -6221,6 +6222,6 @@ TEST_P(Dhcp4GetConfigTest, run) { ...@@ -6221,6 +6222,6 @@ TEST_P(Dhcp4GetConfigTest, run) {
/// Define the parametrized test loop /// Define the parametrized test loop
INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest, INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
::testing::Range(0UL, max_config_counter)); ::testing::Range(static_cast<size_t>(0), max_config_counter));
}; };
...@@ -147,7 +147,7 @@ TEST_F(ClientConnectionTest, timeout) { ...@@ -147,7 +147,7 @@ TEST_F(ClientConnectionTest, timeout) {
conn.start(ClientConnection::SocketPath(unixSocketFilePath()), conn.start(ClientConnection::SocketPath(unixSocketFilePath()),
ClientConnection::ControlCommand(command), ClientConnection::ControlCommand(command),
[this, &handler_invoked](const boost::system::error_code& ec, [this, &handler_invoked](const boost::system::error_code& ec,
const ConstJSONFeedPtr& feed) { const ConstJSONFeedPtr& /*feed*/) {
// Indicate that the callback has been invoked to break the loop // Indicate that the callback has been invoked to break the loop
// below. // below.
handler_invoked = true; handler_invoked = true;
...@@ -173,7 +173,7 @@ TEST_F(ClientConnectionTest, connectionError) { ...@@ -173,7 +173,7 @@ TEST_F(ClientConnectionTest, connectionError) {
conn.start(ClientConnection::SocketPath(unixSocketFilePath()), conn.start(ClientConnection::SocketPath(unixSocketFilePath()),
ClientConnection::ControlCommand(command), ClientConnection::ControlCommand(command),
[this, &handler_invoked](const boost::system::error_code& ec, [this, &handler_invoked](const boost::system::error_code& ec,
const ConstJSONFeedPtr& feed) { const ConstJSONFeedPtr& /*feed*/) {
handler_invoked = true; handler_invoked = true;
ASSERT_TRUE(ec); ASSERT_TRUE(ec);
}); });
......
...@@ -130,7 +130,7 @@ TimerMgrTest::registerTimer(const std::string& timer_name, const long timer_inte ...@@ -130,7 +130,7 @@ TimerMgrTest::registerTimer(const std::string& timer_name, const long timer_inte
} }
void void
TimerMgrTest::doWait(const long timeout, const bool call_receive) { TimerMgrTest::doWait(const long timeout, const bool /*call_receive*/) {
IntervalTimer timer(*io_service_); IntervalTimer timer(*io_service_);
timer.setup([this]() { timer.setup([this]() {
io_service_->stop(); io_service_->stop();
......
...@@ -209,8 +209,6 @@ TimerMgrImpl::unregisterTimer(const std::string& timer_name) { ...@@ -209,8 +209,6 @@ TimerMgrImpl::unregisterTimer(const std::string& timer_name) {
// Cancel any pending asynchronous operation and stop the timer. // Cancel any pending asynchronous operation and stop the timer.
cancel(timer_name); cancel(timer_name);
const TimerInfoPtr& timer_info = timer_info_it->second;
// Remove the timer. // Remove the timer.
registered_timers_.erase(timer_info_it); registered_timers_.erase(timer_info_it);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment