summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-12-29 16:25:13 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-12-29 16:25:13 +0000
commit3d6fb652321f111a9a8e9769c24e2fe6a3ed3259 (patch)
treee82a02f518f646774b1649fb3d68f3bef92e775a
parentRemove flto cos I'm sick of it randomly breaking stuff (diff)
downloadslicer-1.2.2.tar.bz2
slicer-1.2.2.tar.xz
slicer-1.2.2.zip
Compatibility with libdbpp-*-1slicer-1.2.2
-rw-r--r--slicer/db/sqlInsertSerializer.cpp6
-rw-r--r--slicer/db/sqlInsertSerializer.h4
-rw-r--r--slicer/db/sqlUpdateSerializer.cpp2
-rw-r--r--slicer/db/sqlUpdateSerializer.h4
-rw-r--r--slicer/db/testInsert.cpp2
-rw-r--r--slicer/db/testSelect.cpp2
-rw-r--r--slicer/db/testUpdate.cpp2
7 files changed, 11 insertions, 11 deletions
diff --git a/slicer/db/sqlInsertSerializer.cpp b/slicer/db/sqlInsertSerializer.cpp
index fea4bd6..0ff0038 100644
--- a/slicer/db/sqlInsertSerializer.cpp
+++ b/slicer/db/sqlInsertSerializer.cpp
@@ -9,7 +9,7 @@
namespace Slicer {
const std::string md_auto = "db:auto";
- SqlInsertSerializer::SqlInsertSerializer(const DB::Connection * c, const std::string & t) :
+ SqlInsertSerializer::SqlInsertSerializer(DB::Connection * const c, const std::string & t) :
connection(c),
tableName(t)
{
@@ -59,7 +59,7 @@ namespace Slicer {
class IdSave : public Slicer::ValueSource {
public:
- IdSave(const DB::Connection * c) :
+ IdSave(DB::Connection * const c) :
connection(c)
{
}
@@ -81,7 +81,7 @@ namespace Slicer {
NumType(Ice::Double);
private:
- const DB::Connection * connection;
+ DB::Connection * const connection;
};
void
diff --git a/slicer/db/sqlInsertSerializer.h b/slicer/db/sqlInsertSerializer.h
index 389cea8..fe11c36 100644
--- a/slicer/db/sqlInsertSerializer.h
+++ b/slicer/db/sqlInsertSerializer.h
@@ -11,7 +11,7 @@ namespace Slicer {
public:
typedef boost::shared_ptr<DB::ModifyCommand> ModifyPtr;
- SqlInsertSerializer(const DB::Connection *, const std::string & tableName);
+ SqlInsertSerializer(DB::Connection * const, const std::string & tableName);
virtual void Serialize(Slicer::ModelPartPtr) override;
@@ -23,7 +23,7 @@ namespace Slicer {
virtual void bindObjectAndExecute(Slicer::ModelPartPtr, DB::ModifyCommand *) const;
virtual void bindObjectAndExecuteField(int & paramNo, DB::ModifyCommand *, Slicer::ModelPartPtr, HookCommonPtr) const;
- const DB::Connection * connection;
+ DB::Connection * const connection;
const std::string tableName;
};
diff --git a/slicer/db/sqlUpdateSerializer.cpp b/slicer/db/sqlUpdateSerializer.cpp
index 1787a84..65889ab 100644
--- a/slicer/db/sqlUpdateSerializer.cpp
+++ b/slicer/db/sqlUpdateSerializer.cpp
@@ -10,7 +10,7 @@ namespace Slicer {
const std::string md_pkey = "db:pkey";
- SqlUpdateSerializer::SqlUpdateSerializer(const DB::Connection * c, const std::string & t) :
+ SqlUpdateSerializer::SqlUpdateSerializer(DB::Connection * const c, const std::string & t) :
connection(c),
tableName(t)
{
diff --git a/slicer/db/sqlUpdateSerializer.h b/slicer/db/sqlUpdateSerializer.h
index 508bd2d..cbd8d65 100644
--- a/slicer/db/sqlUpdateSerializer.h
+++ b/slicer/db/sqlUpdateSerializer.h
@@ -15,7 +15,7 @@ namespace Slicer {
public:
typedef boost::shared_ptr<DB::ModifyCommand> ModifyPtr;
- SqlUpdateSerializer(const DB::Connection *, const std::string & tableName);
+ SqlUpdateSerializer(DB::Connection * const, const std::string & tableName);
virtual void Serialize(Slicer::ModelPartPtr) override;
@@ -25,7 +25,7 @@ namespace Slicer {
ModifyPtr createUpdate(Slicer::ModelPartPtr) const;
static void bindObjectAndExecute(Slicer::ModelPartPtr, DB::ModifyCommand *);
- const DB::Connection * connection;
+ DB::Connection * const connection;
const std::string tableName;
};
}
diff --git a/slicer/db/testInsert.cpp b/slicer/db/testInsert.cpp
index b1be25f..2068de3 100644
--- a/slicer/db/testInsert.cpp
+++ b/slicer/db/testInsert.cpp
@@ -1,7 +1,7 @@
#define BOOST_TEST_MODULE db_insert
#include <boost/test/unit_test.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
-#include <mock.h>
+#include <pq-mock.h>
#include <slicer/slicer.h>
#include <definedDirs.h>
#include "sqlInsertSerializer.h"
diff --git a/slicer/db/testSelect.cpp b/slicer/db/testSelect.cpp
index cd20170..afea1d3 100644
--- a/slicer/db/testSelect.cpp
+++ b/slicer/db/testSelect.cpp
@@ -1,7 +1,7 @@
#define BOOST_TEST_MODULE db_select
#include <boost/test/unit_test.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
-#include <mock.h>
+#include <pq-mock.h>
#include <slicer/slicer.h>
#include <definedDirs.h>
#include "sqlSelectDeserializer.h"
diff --git a/slicer/db/testUpdate.cpp b/slicer/db/testUpdate.cpp
index 7c2d11d..753c5b6 100644
--- a/slicer/db/testUpdate.cpp
+++ b/slicer/db/testUpdate.cpp
@@ -1,7 +1,7 @@
#define BOOST_TEST_MODULE db_update
#include <boost/test/unit_test.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
-#include <mock.h>
+#include <pq-mock.h>
#include <slicer/slicer.h>
#include <definedDirs.h>
#include "sqlInsertSerializer.h"