diff --git a/src/3rdParty/PyCXX/CXX/Python3/Objects.hxx b/src/3rdParty/PyCXX/CXX/Python3/Objects.hxx index 4894ba9c28..0ed3fc969b 100644 --- a/src/3rdParty/PyCXX/CXX/Python3/Objects.hxx +++ b/src/3rdParty/PyCXX/CXX/Python3/Objects.hxx @@ -1787,8 +1787,8 @@ namespace Py typedef std::basic_string unicodestring; extern Py_UNICODE unicode_null_string[1]; #endif - typedef std::basic_string ucs4string; - extern Py_UCS4 ucs4_null_string[1]; + typedef std::basic_string 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( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast( s ), length ), true ) + : SeqBase( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast( s ), length ), true ) { validate(); } String( const int *s, int length ) - : SeqBase( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast( s ), length ), true ) + : SeqBase( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast( 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( v.data() ), v.length() ), true ); + set( PyUnicode_FromKindAndData( PyUnicode_4BYTE_KIND, reinterpret_cast( v.data() ), v.length() ), true ); return *this; } #endif @@ -2237,7 +2237,7 @@ namespace Py { ifPyErrorThrowCxxException(); } - ucs4string ucs4( buf, size() ); + ucs4string ucs4( reinterpret_cast(buf), size() ); delete[] buf; return ucs4; diff --git a/src/3rdParty/PyCXX/CXX/Python3/cxxsupport.cxx b/src/3rdParty/PyCXX/CXX/Python3/cxxsupport.cxx index a22160bd02..3c58afe960 100644 --- a/src/3rdParty/PyCXX/CXX/Python3/cxxsupport.cxx +++ b/src/3rdParty/PyCXX/CXX/Python3/cxxsupport.cxx @@ -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 { diff --git a/src/3rdParty/PyCXX/CXX/Version.hxx b/src/3rdParty/PyCXX/CXX/Version.hxx index 59fe3c203b..a814ac92d6 100644 --- a/src/3rdParty/PyCXX/CXX/Version.hxx +++ b/src/3rdParty/PyCXX/CXX/Version.hxx @@ -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