Various small fixes.

jtv · May 18, 2020 · 792009b · 792009b
1 parent c6aaf45
commit 792009b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,7 @@
 7.1.1
  - Compile fix for Visual Studio.
+ - Warning fix for clang.
+ - Also install `transaction_focus.hxx`. (#320)
 7.1.0
  - Query tuples straight into `std::tuple` using `transaction::stream()`!
  - And, `stream_from` now supports more or less arbitrary queries.

diff --git a/include/Makefile.am b/include/Makefile.am
@@ -38,11 +38,14 @@ nobase_include_HEADERS= pqxx/pqxx \
 	pqxx/internal/conversions.hxx \
 	pqxx/internal/encoding_group.hxx \
 	pqxx/internal/encodings.hxx \
+	pqxx/internal/ignore-deprecated-post.hxx \
+	pqxx/internal/ignore-deprecated-pre.hxx \
 	pqxx/internal/libpq-forward.hxx \
 	pqxx/internal/result_iter.hxx \
 	pqxx/internal/sql_cursor.hxx \
 	pqxx/internal/statement_parameters.hxx \
 	pqxx/internal/stream_iterator.hxx \
+	pqxx/internal/transaction_focus.hxx \
 	pqxx/internal/gates/connection-errorhandler.hxx \
 	pqxx/internal/gates/connection-largeobject.hxx \
 	pqxx/internal/gates/connection-notification_receiver.hxx \

diff --git a/test/test26.cxx b/test/test26.cxx
@@ -39,7 +39,7 @@ std::map<int, int> update_years(connection &C)
 
   // Note all different years currently occurring in the table, writing them
   // and their correct mappings to m_conversions
-  for (auto const [y] :
+  for (auto const &[y] :
        tx.stream<std::optional<int>>("SELECT year FROM pqxxevents"))
   {
     // Read year, and if it is non-null, note its converted value

diff --git a/test/unit/test_errorhandler.cxx b/test/unit/test_errorhandler.cxx
@@ -37,8 +37,8 @@ namespace pqxx
 {
 template<> struct nullness<TestErrorHandler *>
 {
-  static constexpr bool has_null{true};
-  static constexpr bool always_null{false};
+  [[maybe_unused]] static constexpr bool has_null{true};
+  [[maybe_unused]] static constexpr bool always_null{false};
   static constexpr bool is_null(TestErrorHandler *e) noexcept
   {
     return e == nullptr;

diff --git a/test/unit/test_result_iteration.cxx b/test/unit/test_result_iteration.cxx
@@ -30,7 +30,7 @@ void test_result_iter()
   pqxx::result r{tx.exec("SELECT generate_series(1, 3)")};
 
   int total{0};
-  for (auto const [i] : r.iter<int>()) total += i;
+  for (auto const &[i] : r.iter<int>()) total += i;
   PQXX_CHECK_EQUAL(total, 6, "iter() loop did not get the right values.");
 }