mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 04:28:01 +08:00
[libpqxx] update to 7.7.3 (#24366)
* [libpqxx] update to 7.7.3 * update version
This commit is contained in:
parent
69dc103b6d
commit
6a5e541af5
@ -1,15 +0,0 @@
|
|||||||
# apple clang 13 has a bug where [[likely]] or [[unlikely]] returns
|
|
||||||
# don't count for checking that a constexpr function has a return,
|
|
||||||
# so at least one return must be unmarked
|
|
||||||
--- a/src/robusttransaction.cxx
|
|
||||||
+++ b/src/robusttransaction.cxx
|
|
||||||
@@ -62,9 +62,8 @@ constexpr tx_stat parse_status(std::string_view text) noexcept
|
|
||||||
case 'i':
|
|
||||||
if (text == in_progress)
|
|
||||||
PQXX_LIKELY return tx_in_progress;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
- PQXX_UNLIKELY
|
|
||||||
return tx_unknown;
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +1,12 @@
|
|||||||
diff --git a/include/pqxx/compiler-public.hxx b/include/pqxx/compiler-public.hxx
|
diff --git a/include/pqxx/internal/header-pre.hxx b/include/pqxx/internal/header-pre.hxx
|
||||||
index 5d24c7e..8087191 100644
|
index abc1a39..cba0242 100644
|
||||||
--- a/include/pqxx/compiler-public.hxx
|
--- a/include/pqxx/internal/header-pre.hxx
|
||||||
+++ b/include/pqxx/compiler-public.hxx
|
+++ b/include/pqxx/internal/header-pre.hxx
|
||||||
@@ -43,6 +43,11 @@
|
@@ -90,6 +90,12 @@
|
||||||
// Workarounds for Microsoft Visual C++
|
// Workarounds for Microsoft Visual C++
|
||||||
# ifdef _MSC_VER
|
# ifdef _MSC_VER
|
||||||
|
|
||||||
|
+
|
||||||
+// Workarounds for deprecated attribute syntax error in Visual Studio 2017.
|
+// Workarounds for deprecated attribute syntax error in Visual Studio 2017.
|
||||||
+# if _MSC_VER < 1920
|
+# if _MSC_VER < 1920
|
||||||
+# define PQXX_DEPRECATED(MESSAGE) __declspec(deprecated( #MESSAGE ))
|
+# define PQXX_DEPRECATED(MESSAGE) __declspec(deprecated( #MESSAGE ))
|
||||||
@ -14,7 +15,7 @@ index 5d24c7e..8087191 100644
|
|||||||
// Suppress vtables on abstract classes.
|
// Suppress vtables on abstract classes.
|
||||||
# define PQXX_NOVTABLE __declspec(novtable)
|
# define PQXX_NOVTABLE __declspec(novtable)
|
||||||
|
|
||||||
@@ -112,6 +117,10 @@
|
@@ -159,6 +165,10 @@
|
||||||
# define PQXX_NOVTABLE /* novtable */
|
# define PQXX_NOVTABLE /* novtable */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -22,15 +23,15 @@ index 5d24c7e..8087191 100644
|
|||||||
+# define PQXX_DEPRECATED(MESSAGE) [[deprecated( #MESSAGE )]]
|
+# define PQXX_DEPRECATED(MESSAGE) [[deprecated( #MESSAGE )]]
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
// TODO: Assume support once we're on C++20.
|
// C++20: Assume support.
|
||||||
#if defined(PQXX_HAVE_LIKELY)
|
#if defined(PQXX_HAVE_LIKELY)
|
||||||
# define PQXX_LIKELY [[likely]]
|
# define PQXX_LIKELY [[likely]]
|
||||||
diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx
|
diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx
|
||||||
index f2dcc31..6a74b55 100644
|
index ff4a93d..5b300d6 100644
|
||||||
--- a/include/pqxx/stream_from.hxx
|
--- a/include/pqxx/stream_from.hxx
|
||||||
+++ b/include/pqxx/stream_from.hxx
|
+++ b/include/pqxx/stream_from.hxx
|
||||||
@@ -148,7 +148,7 @@ public:
|
@@ -153,7 +153,7 @@ public:
|
||||||
/** @deprecated Use factory function @c table() or @c raw_table() instead.
|
/** @deprecated Use factories @ref table or @ref raw_table instead.
|
||||||
*/
|
*/
|
||||||
template<typename Iter>
|
template<typename Iter>
|
||||||
- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
|
- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
|
||||||
@ -38,8 +39,8 @@ index f2dcc31..6a74b55 100644
|
|||||||
transaction_base &, from_table_t, std::string_view table,
|
transaction_base &, from_table_t, std::string_view table,
|
||||||
Iter columns_begin, Iter columns_end);
|
Iter columns_begin, Iter columns_end);
|
||||||
|
|
||||||
@@ -156,13 +156,13 @@ public:
|
@@ -161,13 +161,13 @@ public:
|
||||||
/** @deprecated Use factory function @c query() instead.
|
/** @deprecated Use factory function @ref query instead.
|
||||||
*/
|
*/
|
||||||
template<typename Columns>
|
template<typename Columns>
|
||||||
- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
|
- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
|
||||||
@ -48,15 +49,15 @@ index f2dcc31..6a74b55 100644
|
|||||||
Columns const &columns);
|
Columns const &columns);
|
||||||
|
|
||||||
#include "pqxx/internal/ignore-deprecated-pre.hxx"
|
#include "pqxx/internal/ignore-deprecated-pre.hxx"
|
||||||
/// @deprecated Use factory function @c table() or @c raw_table() instead.
|
/// @deprecated Use factories @ref table or @ref raw_table instead.
|
||||||
- [[deprecated("Use the from_table_t overload instead.")]] stream_from(
|
- [[deprecated("Use the from_table_t overload instead.")]] stream_from(
|
||||||
+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
|
+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
|
||||||
transaction_base &tx, std::string_view table) :
|
transaction_base &tx, std::string_view table) :
|
||||||
stream_from{tx, from_table, table}
|
stream_from{tx, from_table, table}
|
||||||
{}
|
{}
|
||||||
@@ -170,14 +170,14 @@ public:
|
@@ -175,14 +175,14 @@ public:
|
||||||
|
|
||||||
/// @deprecated Use factory function @c table() or @c raw_table() instead.
|
/// @deprecated Use factories @ref table or @ref raw_table instead.
|
||||||
template<typename Columns>
|
template<typename Columns>
|
||||||
- [[deprecated("Use the from_table_t overload instead.")]] stream_from(
|
- [[deprecated("Use the from_table_t overload instead.")]] stream_from(
|
||||||
+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
|
+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
|
||||||
@ -64,7 +65,7 @@ index f2dcc31..6a74b55 100644
|
|||||||
stream_from{tx, from_table, table, columns}
|
stream_from{tx, from_table, table, columns}
|
||||||
{}
|
{}
|
||||||
|
|
||||||
/// @deprecated Use factory function @c table() or @c raw_table() instead.
|
/// @deprecated Use factories @ref table or @ref raw_table instead.
|
||||||
template<typename Iter>
|
template<typename Iter>
|
||||||
- [[deprecated("Use the from_table_t overload instead.")]] stream_from(
|
- [[deprecated("Use the from_table_t overload instead.")]] stream_from(
|
||||||
+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
|
+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
|
||||||
@ -72,10 +73,10 @@ index f2dcc31..6a74b55 100644
|
|||||||
Iter columns_end);
|
Iter columns_end);
|
||||||
|
|
||||||
diff --git a/include/pqxx/stream_to.hxx b/include/pqxx/stream_to.hxx
|
diff --git a/include/pqxx/stream_to.hxx b/include/pqxx/stream_to.hxx
|
||||||
index 3ad0292..4b52e31 100644
|
index 2a49d8f..06e602e 100644
|
||||||
--- a/include/pqxx/stream_to.hxx
|
--- a/include/pqxx/stream_to.hxx
|
||||||
+++ b/include/pqxx/stream_to.hxx
|
+++ b/include/pqxx/stream_to.hxx
|
||||||
@@ -168,7 +168,7 @@ public:
|
@@ -169,7 +169,7 @@ public:
|
||||||
* your data fields and the table is explicit in your code, and not hidden
|
* your data fields and the table is explicit in your code, and not hidden
|
||||||
* in an "implicit contract" between your code and your schema.
|
* in an "implicit contract" between your code and your schema.
|
||||||
*/
|
*/
|
||||||
@ -84,20 +85,20 @@ index 3ad0292..4b52e31 100644
|
|||||||
transaction_base &tx, std::string_view table_name) :
|
transaction_base &tx, std::string_view table_name) :
|
||||||
stream_to{tx, table_name, ""sv}
|
stream_to{tx, table_name, ""sv}
|
||||||
{}
|
{}
|
||||||
@@ -177,14 +177,14 @@ public:
|
@@ -178,14 +178,14 @@ public:
|
||||||
/** @deprecated Use @c table() or @c raw_table() as a factory.
|
/** @deprecated Use @ref table or @ref raw_table as a factory.
|
||||||
*/
|
*/
|
||||||
template<typename Columns>
|
template<typename Columns>
|
||||||
- [[deprecated("Use table() or raw_table() factory.")]] stream_to(
|
- [[deprecated("Use table() or raw_table() factory.")]] stream_to(
|
||||||
+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to(
|
+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to(
|
||||||
transaction_base &, std::string_view table_name, Columns const &columns);
|
transaction_base &, std::string_view table_name, Columns const &columns);
|
||||||
|
|
||||||
/// Create a stream, specifying column names as a sequence of strings.
|
/// Create a stream, specifying column names as a sequence of strings.
|
||||||
/** @deprecated Use @c table() or @c raw_table() as a factory.
|
/** @deprecated Use @ref table or @ref raw_table as a factory.
|
||||||
*/
|
*/
|
||||||
template<typename Iter>
|
template<typename Iter>
|
||||||
- [[deprecated("Use table() or raw_table() factory.")]] stream_to(
|
- [[deprecated("Use table() or raw_table() factory.")]] stream_to(
|
||||||
+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to(
|
+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to(
|
||||||
transaction_base &, std::string_view table_name, Iter columns_begin,
|
transaction_base &, std::string_view table_name, Iter columns_begin,
|
||||||
Iter columns_end);
|
Iter columns_end);
|
||||||
|
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO jtv/libpqxx
|
REPO jtv/libpqxx
|
||||||
REF 221ddc8be329bafb376a3d83b9cd257fd52fc7b7 # 7.6.0
|
REF 90768b07f7feb55a9bd70cfaacb5543bfd074022 # 7.7.3
|
||||||
SHA512 32a673bbae2f26fbc41bdcba007d9a5ded29680cb49ba434d1913cd5007bc1c1443bf38c88d9c5a6abe0a3ee519c0f691464c8d2b144cd3f16652447d644e400
|
SHA512 cbb21b148135d9426acd8006bfab872997bae65cfaa7af414083a8d219f099edcc83de7bde5e36016c1f8333f1e4d03fc401a4e741dfd0881afda3e1a20009ff
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
fix_build_with_vs2017.patch
|
fix_build_with_vs2017.patch
|
||||||
fix_build_with_apple_clang_13.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}")
|
file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}")
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"name": "libpqxx",
|
"name": "libpqxx",
|
||||||
"version-semver": "7.6.0",
|
"version": "7.7.3",
|
||||||
"port-version": 3,
|
|
||||||
"description": "The official C++ client API for PostgreSQL",
|
"description": "The official C++ client API for PostgreSQL",
|
||||||
"homepage": "https://www.postgresql.org/",
|
"homepage": "https://www.postgresql.org/",
|
||||||
|
"license": "BSD-3-Clause",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"libpq",
|
"libpq",
|
||||||
{
|
{
|
||||||
|
@ -3897,8 +3897,8 @@
|
|||||||
"port-version": 1
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"libpqxx": {
|
"libpqxx": {
|
||||||
"baseline": "7.6.0",
|
"baseline": "7.7.3",
|
||||||
"port-version": 3
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libprotobuf-mutator": {
|
"libprotobuf-mutator": {
|
||||||
"baseline": "1.0",
|
"baseline": "1.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "da2e393b9844105fa00c800afb44bc93541dcb00",
|
||||||
|
"version": "7.7.3",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "6dd0107ca668c589cf18a57a884dd3ef276730cf",
|
"git-tree": "6dd0107ca668c589cf18a57a884dd3ef276730cf",
|
||||||
"version-semver": "7.6.0",
|
"version-semver": "7.6.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user