kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Py3.13: Update PyCXX to version 7.1.11

Browse Source
This commit is contained in:
wmayer
2025-05-27 11:34:34 +02:00
committed by Benjamin Nauck
parent 0cdf0af0c6
commit 39ca75bac2
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/3rdParty/PyCXX/CXX/Python3/Objects.hxx vendored
View File

@@ -1787,8 +1787,8 @@ namespace Py
typedef std::basic_string<Py_UNICODE> unicodestring;
extern Py_UNICODE unicode_null_string[1];
#endif
typedef std::basic_string<Py_UCS4> ucs4string;
extern Py_UCS4 ucs4_null_string[1];
typedef std::basic_string<char32_t> ucs4string;
extern char32_t ucs4_null_string[1];
class PYCXX_EXPORT Byte: public Object
{
@@ -2152,13 +2152,13 @@ namespace Py
// Need these c'tors becuase Py_UNICODE is 2 bytes
// User may use "int" or "unsigned int" as the unicode type
String( const unsigned int *s, int length )
: SeqBase<Char>( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast<const Py_UCS4 *>( s ), length ), true )
: SeqBase<Char>( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast<const char32_t *>( s ), length ), true )
{
validate();
}
String( const int *s, int length )
: SeqBase<Char>( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast<const Py_UCS4 *>( s ), length ), true )
: SeqBase<Char>( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast<const char32_t *>( s ), length ), true )
{
validate();
}
@@ -2196,7 +2196,7 @@ namespace Py
#if !defined( Py_UNICODE_WIDE ) && !defined( Py_LIMITED_API )
String &operator=( const ucs4string &v )
{
set( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast<const Py_UCS4 *>( v.data() ), v.length() ), true );
set( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast<const char32_t *>( v.data() ), v.length() ), true );
return *this;
}
#endif
@@ -2237,7 +2237,7 @@ namespace Py
{
ifPyErrorThrowCxxException();
}
ucs4string ucs4( buf, size() );
ucs4string ucs4( reinterpret_cast<char32_t *>(buf), size() );
delete[] buf;
return ucs4;

2
src/3rdParty/PyCXX/CXX/Python3/cxxsupport.cxx vendored
View File

@@ -48,7 +48,7 @@ Py_ssize_t numeric_limits_max()
#if !defined(Py_LIMITED_API)
Py_UNICODE unicode_null_string[1] = { 0 };
#endif
Py_UCS4 ucs4_null_string[1] = { 0 };
char32_t ucs4_null_string[1] = { 0 };
Type Object::type() const
{

2
src/3rdParty/PyCXX/CXX/Version.hxx vendored
View File

@@ -40,7 +40,7 @@
#define PYCXX_VERSION_MAJOR 7
#define PYCXX_VERSION_MINOR 1
#define PYCXX_VERSION_PATCH 9
#define PYCXX_VERSION_PATCH 11
#define PYCXX_MAKEVERSION( major, minor, patch ) ((major<<16)|(minor<<8)|(patch))
#define PYCXX_VERSION PYCXX_MAKEVERSION( PYCXX_VERSION_MAJOR, PYCXX_VERSION_MINOR, PYCXX_VERSION_PATCH )
#endif