[4328] Merge branch 'andir-pull-request-29' into trac4328

Ported this change from https://github.com/andir/kea.git,
branch fix-make_pair.

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<uint32_t, uint32_t>(version, minor);
+    return make_pair(version, minor);
 }
 
 void

src/lib/dhcpsrv/pgsql_host_data_source.cc

@@ -1698,7 +1698,7 @@ std::pair<uint32_t, uint32_t> PgSqlHostDataSourceImpl::getVersion() const {
     uint32_t minor;
     PgSqlExchange::getColumnValue(r, 0, 0, minor);
 
-    return (std::make_pair<uint32_t, uint32_t>(version, minor));
+    return (std::make_pair(version, minor));
 }
 
 void

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<uint32_t, uint32_t>(version, minor);
+    return make_pair(version, minor);
 }
 
 void