From fbad5dcdf8f17d1a3f3ff954f48b55d605d0a50c Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 9 Apr 2018 12:06:17 +0100
Subject: C++17

Updates to include C++17 changes for command options.
---
 libpqpp/pq-connection.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libpqpp/pq-connection.cpp')

diff --git a/libpqpp/pq-connection.cpp b/libpqpp/pq-connection.cpp
index 214f211..3ec8991 100644
--- a/libpqpp/pq-connection.cpp
+++ b/libpqpp/pq-connection.cpp
@@ -62,7 +62,7 @@ PQ::Connection::rollbackTxInt()
 }
 
 void
-PQ::Connection::execute(const std::string & sql, const DB::CommandOptions *)
+PQ::Connection::execute(const std::string & sql, const DB::CommandOptionsCPtr &)
 {
 	checkResultFree(PQexec(conn, sql.c_str()), PGRES_COMMAND_OK, PGRES_TUPLES_OK);
 }
@@ -97,9 +97,9 @@ PQ::Connection::ping() const
 
 
 DB::SelectCommandPtr
-PQ::Connection::select(const std::string & sql, const DB::CommandOptions * opts)
+PQ::Connection::select(const std::string & sql, const DB::CommandOptionsCPtr & opts)
 {
-	auto pqco = dynamic_cast<const CommandOptions *>(opts);
+	auto pqco = std::dynamic_pointer_cast<const CommandOptions>(opts);
 	if (pqco && !pqco->useCursor) {
 		return std::make_shared<BulkSelectCommand>(this, sql, pqco, opts);
 	}
@@ -107,7 +107,7 @@ PQ::Connection::select(const std::string & sql, const DB::CommandOptions * opts)
 }
 
 DB::ModifyCommandPtr
-PQ::Connection::modify(const std::string & sql, const DB::CommandOptions * opts)
+PQ::Connection::modify(const std::string & sql, const DB::CommandOptionsCPtr & opts)
 {
 	return std::make_shared<ModifyCommand>(this, sql, opts);
 }
@@ -176,11 +176,11 @@ PQ::Connection::bulkUploadData(const char * data, size_t len) const
 }
 
 static const std::string selectLastVal("SELECT lastval()");
-static const DB::CommandOptions selectLastValOpts(std::hash<std::string>()(selectLastVal));
+static const DB::CommandOptionsCPtr selectLastValOpts = std::make_shared<DB::CommandOptions>(std::hash<std::string>()(selectLastVal));
 int64_t
 PQ::Connection::insertId()
 {
-	BulkSelectCommand getId(this, selectLastVal, nullptr, &selectLastValOpts);
+	BulkSelectCommand getId(this, selectLastVal, nullptr, selectLastValOpts);
 	int64_t id = -1;
 	while (getId.fetch()) {
 		getId[0] >> id;
-- 
cgit v1.2.3