From 7fbc828326dd9e76463acf9cdd77713d3aea7806 Mon Sep 17 00:00:00 2001 From: eelke Date: Sat, 6 Mar 2021 13:15:17 +0100 Subject: [PATCH] misc stuff --- pglablib/ConnectionConfig.cpp | 7 ------- pgsql/Pgsql_Params.h | 2 +- tests/pglabtests/tst_Range.cpp | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pglablib/ConnectionConfig.cpp b/pglablib/ConnectionConfig.cpp index c1d1d02..808a521 100644 --- a/pglablib/ConnectionConfig.cpp +++ b/pglablib/ConnectionConfig.cpp @@ -47,13 +47,6 @@ SslMode StringToSslMode(QString s) return {}; } - -//std::vector ConnectionConfig::s_keywords = { -// "host", "hostaddr", "port", "user", "password", "dbname", -// "sslmode", "sslcert", "sslkey", "sslrootcrt", "sslcrl", -// "client_encoding", "application_name", nullptr }; - - ConnectionConfig::ConnectionConfig() : m_applicationName(QCoreApplication::applicationName().toUtf8().data()) {} diff --git a/pgsql/Pgsql_Params.h b/pgsql/Pgsql_Params.h index 7ecbe60..77a03b9 100644 --- a/pgsql/Pgsql_Params.h +++ b/pgsql/Pgsql_Params.h @@ -45,7 +45,7 @@ namespace Pgsql { void clear(); bool empty() const { return m_paramTypes.empty(); } - int size() const { return m_paramTypes.size(); } + int size() const { return static_cast(m_paramTypes.size()); } const Oid* types() const { return m_paramTypes.data(); } const char* const* values() const { return m_paramValues.data(); } diff --git a/tests/pglabtests/tst_Range.cpp b/tests/pglabtests/tst_Range.cpp index 6048d20..2052c71 100644 --- a/tests/pglabtests/tst_Range.cpp +++ b/tests/pglabtests/tst_Range.cpp @@ -29,7 +29,7 @@ public: bool overlap(Range r) const { - if ( (r.m_start < m_end || (m_incl)) + if ( (r.m_start < m_end || (m_inclStart)) && r.m_end > m_start) return true;