From a802c57549d0111292eec1b9c0df86377efcf491 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 17 Apr 2018 19:15:08 +0100 Subject: C++17 Updates code largely in-keeping with updates to be C++17 in line with libadhocutil and libdbpp. --- libsqlitepp/sqlite-mock.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libsqlitepp/sqlite-mock.cpp') diff --git a/libsqlitepp/sqlite-mock.cpp b/libsqlitepp/sqlite-mock.cpp index 6a2edb5..418a6ac 100644 --- a/libsqlitepp/sqlite-mock.cpp +++ b/libsqlitepp/sqlite-mock.cpp @@ -7,8 +7,7 @@ NAMEDFACTORY("sqlite", SQLite::Mock, DB::MockDatabaseFactory); namespace SQLite { -Mock::Mock(const std::string & root, const std::string & name, const std::vector & ss) : - MockDatabase(name), +Mock::Mock(const std::string & root, const std::string &, const std::vector & ss) : testDbPath(boost::filesystem::path(root) / boost::lexical_cast(getpid()) / boost::lexical_cast(++DB::MockDatabase::mocked)) { CreateNewDatabase(); @@ -20,10 +19,10 @@ Mock::Mock(const std::string & name, const std::vector { } -DB::Connection * +DB::ConnectionPtr Mock::openConnection() const { - return new Connection(testDbPath.string()); + return std::make_shared(testDbPath.string()); } Mock::~Mock() @@ -39,7 +38,7 @@ void Mock::DropDatabase() const void Mock::CreateNewDatabase() const { boost::filesystem::create_directories(testDbPath.parent_path()); - delete openConnection(); + openConnection(); // Triggers file creation } } -- cgit v1.2.3