Commit ad68c394 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[master] Merge branch 'trac4328_1'

parents 331a226a c36223da
......@@ -109,6 +109,9 @@ We have received the following contributions:
- Michal Humpula
2016-07: Response to DHCPINFORM is sent to port 68
- Andreas Rammhold
2016-09: Compilation fixes for GCC 6, using C++14.
Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
Boost (http://www.boost.org/) library for almost everything, and can use Botan
(http://botan.randombit.net/) or OpenSSL (https://www.openssl.org/) for
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
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