Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc022930

Browse files
committed
Remove deprecated function call
1 parent5d55b6a commitc022930

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

‎src/runtime/Converter.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,10 +686,8 @@ internal static bool ToPrimitive(BorrowedReference value, Type obType, out objec
686686
{
687687
if(Runtime.PyUnicode_GetLength(value)==1)
688688
{
689-
IntPtrunicodePtr=Runtime.PyUnicode_AsUnicode(value);
690-
Char[]buff=newChar[1];
691-
Marshal.Copy(unicodePtr,buff,0,1);
692-
result=buff[0];
689+
intchr=Runtime.PyUnicode_ReadChar(value,0);
690+
result=(Char)chr;
693691
returntrue;
694692
}
695693
gototype_error;

‎src/runtime/Runtime.Delegates.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ static Delegates()
164164
PyUnicode_AsUTF8=(delegate* unmanaged[Cdecl]<BorrowedReference,IntPtr>)GetFunctionByName(nameof(PyUnicode_AsUTF8),GetUnmanagedDll(_PythonDll));
165165
PyUnicode_DecodeUTF16=(delegate* unmanaged[Cdecl]<IntPtr,nint,IntPtr,IntPtr,NewReference>)GetFunctionByName(nameof(PyUnicode_DecodeUTF16),GetUnmanagedDll(_PythonDll));
166166
PyUnicode_GetLength=(delegate* unmanaged[Cdecl]<BorrowedReference,nint>)GetFunctionByName(nameof(PyUnicode_GetLength),GetUnmanagedDll(_PythonDll));
167-
PyUnicode_AsUnicode=(delegate* unmanaged[Cdecl]<BorrowedReference,IntPtr>)GetFunctionByName(nameof(PyUnicode_AsUnicode),GetUnmanagedDll(_PythonDll));
168167
PyUnicode_AsUTF16String=(delegate* unmanaged[Cdecl]<BorrowedReference,NewReference>)GetFunctionByName(nameof(PyUnicode_AsUTF16String),GetUnmanagedDll(_PythonDll));
168+
PyUnicode_ReadChar=(delegate* unmanaged[Cdecl]<BorrowedReference,nint,int>)GetFunctionByName(nameof(PyUnicode_ReadChar),GetUnmanagedDll(_PythonDll));
169169
PyUnicode_FromOrdinal=(delegate* unmanaged[Cdecl]<int,NewReference>)GetFunctionByName(nameof(PyUnicode_FromOrdinal),GetUnmanagedDll(_PythonDll));
170170
PyUnicode_InternFromString=(delegate* unmanaged[Cdecl]<StrPtr,NewReference>)GetFunctionByName(nameof(PyUnicode_InternFromString),GetUnmanagedDll(_PythonDll));
171171
PyUnicode_Compare=(delegate* unmanaged[Cdecl]<BorrowedReference,BorrowedReference,int>)GetFunctionByName(nameof(PyUnicode_Compare),GetUnmanagedDll(_PythonDll));
@@ -441,7 +441,7 @@ static Delegates()
441441
internalstaticdelegate* unmanaged[Cdecl]<BorrowedReference,IntPtr>PyUnicode_AsUTF8{get;}
442442
internalstaticdelegate* unmanaged[Cdecl]<IntPtr,nint,IntPtr,IntPtr,NewReference>PyUnicode_DecodeUTF16{get;}
443443
internalstaticdelegate* unmanaged[Cdecl]<BorrowedReference,nint>PyUnicode_GetLength{get;}
444-
internalstaticdelegate* unmanaged[Cdecl]<BorrowedReference,IntPtr>PyUnicode_AsUnicode{get;}
444+
internalstaticdelegate* unmanaged[Cdecl]<BorrowedReference,nint,int>PyUnicode_ReadChar{get;}
445445
internalstaticdelegate* unmanaged[Cdecl]<BorrowedReference,NewReference>PyUnicode_AsUTF16String{get;}
446446
internalstaticdelegate* unmanaged[Cdecl]<int,NewReference>PyUnicode_FromOrdinal{get;}
447447
internalstaticdelegate* unmanaged[Cdecl]<StrPtr,NewReference>PyUnicode_InternFromString{get;}

‎src/runtime/Runtime.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1290,9 +1290,10 @@ internal static IntPtr PyBytes_AsString(BorrowedReference ob)
12901290
internalstaticnintPyUnicode_GetLength(BorrowedReferenceob)=>Delegates.PyUnicode_GetLength(ob);
12911291

12921292

1293-
internalstaticIntPtrPyUnicode_AsUnicode(BorrowedReferenceob)=>Delegates.PyUnicode_AsUnicode(ob);
12941293
internalstaticNewReferencePyUnicode_AsUTF16String(BorrowedReferenceob)=>Delegates.PyUnicode_AsUTF16String(ob);
12951294

1295+
internalstaticintPyUnicode_ReadChar(BorrowedReferenceob,nintindex)=>Delegates.PyUnicode_ReadChar(ob,index);
1296+
12961297

12971298

12981299
internalstaticNewReferencePyUnicode_FromOrdinal(intc)=>Delegates.PyUnicode_FromOrdinal(c);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp