summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2020-03-28 17:56:00 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2020-03-28 17:56:00 +0000
commitf571f6b2bf1370b0757c29162988a40e02a82f91 (patch)
treedf4662e44ad3bf79a6d829f22a4a4fbc78c5ade4
parentRefactor to ease testing (diff)
downloadlibdbpp-sqlite-1.4.3.tar.bz2
libdbpp-sqlite-1.4.3.tar.xz
libdbpp-sqlite-1.4.3.zip
Fixes for tidylibdbpp-sqlite-1.4.3
-rw-r--r--libsqlitepp/sqlite-mock.cpp2
-rw-r--r--libsqlitepp/sqlite-mock.h7
2 files changed, 6 insertions, 3 deletions
diff --git a/libsqlitepp/sqlite-mock.cpp b/libsqlitepp/sqlite-mock.cpp
index 4a96e35..18f7df8 100644
--- a/libsqlitepp/sqlite-mock.cpp
+++ b/libsqlitepp/sqlite-mock.cpp
@@ -37,7 +37,7 @@ void Mock::DropDatabase() const
void Mock::CreateNewDatabase() const
{
std::filesystem::create_directories(testDbPath.parent_path());
- Mock::openConnection(); // Triggers file creation
+ (void) Mock::openConnection(); // Triggers file creation
}
}
diff --git a/libsqlitepp/sqlite-mock.h b/libsqlitepp/sqlite-mock.h
index cc182d4..45caef9 100644
--- a/libsqlitepp/sqlite-mock.h
+++ b/libsqlitepp/sqlite-mock.h
@@ -4,6 +4,7 @@
#include <mockDatabase.h>
#include <filesystem>
#include <visibility.h>
+#include <c++11Helpers.h>
namespace SQLite {
@@ -11,13 +12,15 @@ class DLL_PUBLIC Mock : public DB::MockDatabase {
public:
Mock(const std::string & root, const std::string & name, const std::vector<std::filesystem::path> & ss);
Mock(const std::string & name, const std::vector<std::filesystem::path> & ss);
- ~Mock();
+ ~Mock() override;
+
+ SPECIAL_MEMBERS_MOVE_RO(Mock);
protected:
void DropDatabase() const override;
void CreateNewDatabase() const override;
- DB::ConnectionPtr openConnection() const override;
+ [[nodiscard]] DB::ConnectionPtr openConnection() const override;
private:
const std::filesystem::path testDbPath;