Skip to content

Commit 8e6fab3

Browse files
authored
Avoid deprecation warning for <ciso646>. (#1027)
I was being too conservative in removing the use of this header. True, it was still a part of the standard in C++17. But it was already deprecated at that point!
1 parent 9474e13 commit 8e6fab3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
- Fix `result::affected_rows()` for empty results. (#1018)
1212
- Fix error message in `result::expect_columns()`. (#1020)
1313
- Fix for compilers that support concepts but not ranges. (#1017)
14+
- Avoid deprecation warning for `<ciso646>`. (#1023)
1415
7.10.1
1516
- Fix string conversion buffer budget for arrays containing nulls. (#921)
1617
- Remove `-fanalyzer` option again; gcc is still broken.

include/pqxx/internal/header-pre.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565

6666
// C++20: No longer needed.
6767
// Enable ISO-646 alternative operaotr representations: "and" instead of "&&"
68-
// etc. on older compilers. C++20 removes this header.
69-
#if PQXX_CPLUSPLUS <= 201703L && __has_include(<ciso646>)
68+
// etc. on older compilers. C++17 deprecates this header; C++20 removes it.
69+
#if PQXX_CPLUSPLUS < 201703L && __has_include(<ciso646>)
7070
# include <ciso646>
7171
#endif
7272

0 commit comments

Comments
 (0)