From 482663a3c9fd2c05c19d4907145eaf5893a5d55a Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 6 Sep 2016 14:37:05 +0200 Subject: [PATCH] Fix compilation with GCC 6.0 std::make_pair changes With C++14, std::make_pair(t,u) expects rvalue. If trying to pass an lvalue, either std::make_pair(t,u) and type is deduced, or std::pair(t,y). --- src/lib/dhcpsrv/cql_lease_mgr.cc | 2 +- src/lib/dhcpsrv/pgsql_host_data_source.cc | 2 +- src/lib/dhcpsrv/pgsql_lease_mgr.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/dhcpsrv/cql_lease_mgr.cc b/src/lib/dhcpsrv/cql_lease_mgr.cc index 6ccab4f91c..ca7aeb8fe8 100644 --- a/src/lib/dhcpsrv/cql_lease_mgr.cc +++ b/src/lib/dhcpsrv/cql_lease_mgr.cc @@ -1954,7 +1954,7 @@ CqlLeaseMgr::getVersion() const { cass_future_free(future); cass_statement_free(statement); - return make_pair(version, minor); + return make_pair(version, minor); } void diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc index 732db7cf1d..91fba2fa84 100644 --- a/src/lib/dhcpsrv/pgsql_host_data_source.cc +++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc @@ -1698,7 +1698,7 @@ std::pair PgSqlHostDataSourceImpl::getVersion() const { uint32_t minor; PgSqlExchange::getColumnValue(r, 0, 0, minor); - return (std::make_pair(version, minor)); + return (std::make_pair(version, minor)); } void diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc index 84c005c330..02e30f7c7c 100644 --- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc +++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc @@ -1391,7 +1391,7 @@ PgSqlLeaseMgr::getVersion() const { tmp.str(PQgetvalue(r, 0, 1)); tmp >> minor; - return make_pair(version, minor); + return make_pair(version, minor); } void -- 2.47.2