From 74068ff4e23478e6b2798fffec67542b19054369 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 30 Dec 2015 14:10:35 +0000 Subject: Compatibility with libdbpp-*-1 --- p2pvr/daemon/maintenance/events.cpp | 2 +- p2pvr/daemon/unittests/mockDefs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/p2pvr/daemon/maintenance/events.cpp b/p2pvr/daemon/maintenance/events.cpp index 7029398..c8fee58 100644 --- a/p2pvr/daemon/maintenance/events.cpp +++ b/p2pvr/daemon/maintenance/events.cpp @@ -90,7 +90,7 @@ Maintenance::UpdateEvents(const Ice::Current & ice) SqlMergeTask mergeEvents("postgres", "events"); auto ecs = CreateColumns(boost::bind(SqlMergeColumnsInserter, &mergeEvents, _1, _2)); mergeEvents.sources.insert(new SiEventsMerger(ice, ecs)); - mergeEvents.insteadOfDelete = new DynamicSql::SqlText("SET current = false"); + mergeEvents.insteadOfDelete = new DynamicSql::SqlText("current = false"); mergeEvents.updateWhere = new DynamicSql::SqlText("a.current"); mergeEvents.loadComplete(this); mergeEvents.execute(&ec); diff --git a/p2pvr/daemon/unittests/mockDefs.h b/p2pvr/daemon/unittests/mockDefs.h index 5df19ca..bf5481d 100644 --- a/p2pvr/daemon/unittests/mockDefs.h +++ b/p2pvr/daemon/unittests/mockDefs.h @@ -1,7 +1,7 @@ #ifndef MOCKDEFS_H #define MOCKDEFS_H -#include +#include #define DECLAREMOCK(Name) class Name : public PQ::Mock { public: Name(); } -- cgit v1.2.3