Merge pull request #6064 from Microsoft/dev/Lily/5899

[libpqxx]Update to version 6.4.3
This commit is contained in:
Griffin Downs 2019-04-12 04:23:45 -07:00 committed by GitHub
commit 2f772fa93c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 4 deletions

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(libpqxx VERSION 6.0.0 LANGUAGES CXX)
project(libpqxx VERSION 6.4.3 LANGUAGES CXX)
set(CMAKE_DEBUG_POSTFIX "d")
set(CMAKE_CXX_STANDARD 14)

View File

@ -1,4 +1,4 @@
Source: libpqxx
Version: 6.0.0-1
Version: 6.4.3
Description: The official C++ client API for PostgreSQL
Build-Depends: libpq

View File

@ -0,0 +1,40 @@
diff --git a/include/pqxx/tablereader.hxx b/include/pqxx/tablereader.hxx
index f5300cb..0cc0e43 100644
--- a/include/pqxx/tablereader.hxx
+++ b/include/pqxx/tablereader.hxx
@@ -34,13 +34,13 @@ public:
const std::string &Name,
const std::string &Null=std::string{});
template<typename ITER>
- PQXX_DEPRECATED tablereader(
+ tablereader(
transaction_base &,
const std::string &Name,
ITER begincolumns,
ITER endcolumns);
template<typename ITER>
- PQXX_DEPRECATED tablereader(
+ tablereader(
transaction_base &,
const std::string &Name,
ITER begincolumns,
diff --git a/include/pqxx/tablewriter.hxx b/include/pqxx/tablewriter.hxx
index 32e7a98..a25b356 100644
--- a/include/pqxx/tablewriter.hxx
+++ b/include/pqxx/tablewriter.hxx
@@ -36,13 +36,13 @@ public:
const std::string &WName,
const std::string &Null=std::string{});
template<typename ITER>
- PQXX_DEPRECATED tablewriter(
+ tablewriter(
transaction_base &,
const std::string &WName,
ITER begincolumns,
ITER endcolumns);
template<typename ITER>
- PQXX_DEPRECATED tablewriter(
+ tablewriter(
transaction_base &T,
const std::string &WName,
ITER begincolumns,

View File

@ -3,9 +3,11 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO jtv/libpqxx
REF 6.0.0
SHA512 f237cc03c01a8262eee44a9428206c1cc11b6034dddf540afef145f58eee5c32b880d84832563480d73d834c24311170e2ef6789e100793afbe0b6e393bd4169
REF 6.4.3
SHA512 d2d54adf4f498cba0ec20bb37b7a32d18b25e298d81b1884aecb3edec99beca6a10683478e6ca02953ace0b20d335a87b926bf77cbe3cb40822cf12649ea65c5
HEAD_REF master
PATCHES
fix-deprecated-bug.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})