diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-12-30 14:10:35 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-12-30 14:10:35 +0000 |
| commit | 74068ff4e23478e6b2798fffec67542b19054369 (patch) | |
| tree | 2cabc6d014c3b6cfc2dd506aa2f0fd938ef16327 | |
| parent | Remove flto cos I'm sick of it randomly breaking stuff (diff) | |
| download | p2pvr-74068ff4e23478e6b2798fffec67542b19054369.tar.bz2 p2pvr-74068ff4e23478e6b2798fffec67542b19054369.tar.xz p2pvr-74068ff4e23478e6b2798fffec67542b19054369.zip | |
Compatibility with libdbpp-*-1p2pvr-0.1.4
| -rw-r--r-- | p2pvr/daemon/maintenance/events.cpp | 2 | ||||
| -rw-r--r-- | 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<DVBSI::EventPtr>(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 <mock.h> +#include <pq-mock.h> #define DECLAREMOCK(Name) class Name : public PQ::Mock { public: Name(); } |