Fixing bugs created from new C++ standard

This commit is contained in:
Zdenek Dohnal 2016-03-16 10:10:02 +01:00
parent 8e05dbd0e5
commit e81aee766c
1 changed files with 9 additions and 20 deletions

View File

@ -1,35 +1,24 @@
diff -up kea-1.0.0/ext/coroutine/coroutine.h.backup kea-1.0.0/ext/coroutine/coroutine.h
--- kea-1.0.0/ext/coroutine/coroutine.h.backup 2016-03-10 14:05:39.158550805 +0100
+++ kea-1.0.0/ext/coroutine/coroutine.h 2016-03-10 14:07:03.227878558 +0100
@@ -108,7 +108,6 @@ private:
diff -up ./ext/coroutine/coroutine.h.coroutinepgsql ./ext/coroutine/coroutine.h
--- ./ext/coroutine/coroutine.h.coroutinepgsql 2015-12-28 13:18:05.000000000 +0100
+++ ./ext/coroutine/coroutine.h 2016-03-15 14:58:26.344825900 +0100
@@ -108,7 +108,7 @@ private:
for (_coro_value = __LINE__;;) \
if (_coro_value == 0) \
{ \
- case __LINE__: ; \
+/* case __LINE__: ;*/ \
break; \
} \
else \
diff -up kea-1.0.0/src/lib/dhcpsrv/pgsql_lease_mgr.cc.backup kea-1.0.0/src/lib/dhcpsrv/pgsql_lease_mgr.cc
--- kea-1.0.0/src/lib/dhcpsrv/pgsql_lease_mgr.cc.backup 2016-03-10 14:06:46.263014215 +0100
+++ kea-1.0.0/src/lib/dhcpsrv/pgsql_lease_mgr.cc 2016-03-10 14:30:54.466785453 +0100
diff -up ./src/lib/dhcpsrv/pgsql_lease_mgr.cc.coroutinepgsql ./src/lib/dhcpsrv/pgsql_lease_mgr.cc
--- ./src/lib/dhcpsrv/pgsql_lease_mgr.cc.coroutinepgsql 2015-12-28 13:18:45.000000000 +0100
+++ ./src/lib/dhcpsrv/pgsql_lease_mgr.cc 2016-03-15 13:59:06.837391677 +0100
@@ -1690,7 +1690,7 @@ PgSqlLeaseMgr::getVersion() const {
PQclear(r);
- return make_pair<uint32_t, uint32_t>(version, minor);
+ return make_pair<uint32_t &&, uint32_t &&>(std::move(version), std::move(minor));
+ return (make_pair(version, minor));
}
void