From a028d752aba0852af0ad05bafd01007b2f29cb7d Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Tue, 4 Feb 2025 12:35:53 -0500 Subject: [PATCH] Updates for pqxx <7 using tablewriter --- irdb-libs/libIRDB-core/src/fileir.cpp | 3 +++ irdb-libs/meds2pdb/meds2pdb.cpp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/irdb-libs/libIRDB-core/src/fileir.cpp b/irdb-libs/libIRDB-core/src/fileir.cpp index af28c51a5..cc1c3b4ac 100644 --- a/irdb-libs/libIRDB-core/src/fileir.cpp +++ b/irdb-libs/libIRDB-core/src/fileir.cpp @@ -37,6 +37,9 @@ #include "assemblestr.hpp" #include <pqxx/pqxx> +#if PQXX_MAJOR_VERISON < 7 +#include <pqxx/tablewriter.hxx> +#endif #pragma GCC diagnostic ignored "-Wdeprecated-declarations" using namespace libIRDB; diff --git a/irdb-libs/meds2pdb/meds2pdb.cpp b/irdb-libs/meds2pdb/meds2pdb.cpp index 956008686..2090b6731 100644 --- a/irdb-libs/meds2pdb/meds2pdb.cpp +++ b/irdb-libs/meds2pdb/meds2pdb.cpp @@ -33,7 +33,9 @@ #include <irdb-core> #include <pqxx/pqxx> -//#include <pqxx/tablewriter.hxx> +#if PQXX_MAJOR_VERISON < 7 +#include <pqxx/tablewriter.hxx> +#endif #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #if PQXX_VERSION_MAJOR < 7 -- GitLab