Merge branch 'pybind:master' into master

This commit is contained in:
Steve R. Sun 2023-08-04 08:47:54 +08:00 committed by GitHub
commit 887a7afe19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 2 deletions

View File

@ -302,6 +302,9 @@ jobs:
- clang: 15 - clang: 15
std: 20 std: 20
container_suffix: "-bullseye" container_suffix: "-bullseye"
- clang: 16
std: 20
container_suffix: "-bullseye"
name: "🐍 3 • Clang ${{ matrix.clang }} • C++${{ matrix.std }} • x64" name: "🐍 3 • Clang ${{ matrix.clang }} • C++${{ matrix.std }} • x64"
container: "silkeh/clang:${{ matrix.clang }}${{ matrix.container_suffix }}" container: "silkeh/clang:${{ matrix.clang }}${{ matrix.container_suffix }}"
@ -465,6 +468,7 @@ jobs:
- { gcc: 10, std: 17 } - { gcc: 10, std: 17 }
- { gcc: 11, std: 20 } - { gcc: 11, std: 20 }
- { gcc: 12, std: 20 } - { gcc: 12, std: 20 }
- { gcc: 13, std: 20 }
name: "🐍 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64" name: "🐍 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64"
container: "gcc:${{ matrix.gcc }}" container: "gcc:${{ matrix.gcc }}"

View File

@ -1377,7 +1377,15 @@ inline namespace literals {
/** \rst /** \rst
String literal version of `arg` String literal version of `arg`
\endrst */ \endrst */
constexpr arg operator"" _a(const char *name, size_t) { return arg(name); } constexpr arg
#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5
operator"" _a // gcc 4.8.5 insists on having a space (hard error).
#else
operator""_a // clang 17 generates a deprecation warning if there is a space.
#endif
(const char *name, size_t) {
return arg(name);
}
} // namespace literals } // namespace literals
PYBIND11_NAMESPACE_BEGIN(detail) PYBIND11_NAMESPACE_BEGIN(detail)

View File

@ -1612,7 +1612,15 @@ inline namespace literals {
/** \rst /** \rst
String literal version of `str` String literal version of `str`
\endrst */ \endrst */
inline str operator"" _s(const char *s, size_t size) { return {s, size}; } inline str
#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5
operator"" _s // gcc 4.8.5 insists on having a space (hard error).
#else
operator""_s // clang 17 generates a deprecation warning if there is a space.
#endif
(const char *s, size_t size) {
return {s, size};
}
} // namespace literals } // namespace literals
/// \addtogroup pytypes /// \addtogroup pytypes