8000 apply amos interop changes from soft shutdown by koubaa · Pull Request #1219 · pythonnet/pythonnet · GitHub
[go: up one dir, main page]
Skip to content

apply amos interop changes from soft shutdown #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

apply amos interop changes from soft shutdown #1219

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
776ae32
apply amos changes from soft shutdown
koubaa Sep 13, 2020
e8a53d0
fix other versions
koubaa Sep 13, 2020
c26c6f8
interop template
koubaa Sep 14, 2020
bb1ebe3
fixes
koubaa Sep 16, 2020
7f576cf
use HasFlag
koubaa Sep 16, 2020
8e1fa20
remove unused dictionary
koubaa Sep 18, 2020
022be19
Merge branch 'master' into amos-interop-changes
filmor Sep 21, 2020
2db6fa0
Merge branch 'master' into amos-interop-changes
filmor Oct 1, 2020
079150c
Merge branch 'master' into amos-interop-changes
filmor Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use HasFlag
  • Loading branch information
@koubaa
koubaa committed Sep 17, 2020
commit 7f576cfc8dc505cce30c0adb4d3d4d62d76207df
4 changes: 2 additions & 2 deletions src/runtime/clrobject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ internal CLRObject(object ob, IntPtr tp)
{
IntPtr py = Runtime.PyType_GenericAlloc(tp, 0);

long flags = Util.ReadCLong(tp, TypeOffset.tp_flags);
if ((flags & (int)TypeFlags.Subclass) != 0)
var flags = (TypeFlags)Util.ReadCLong(tp, TypeOffset.tp_flags);
if (flags.HasFlag(TypeFlags.Subclass))
{
IntPtr dict = Marshal.ReadIntPtr(py, ObjectOffset.TypeDictOffset(tp));
if (dict == IntPtr.Zero)
Expand Down
7 changes: 2 additions & 5 deletions src/runtime/managedtype.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,8 @@ internal static bool IsManagedType(IntPtr ob)
tp = ob;
}

var flags = Util.ReadCLong(tp, TypeOffset.tp_flags);
if ((flags & (int)TypeFlags.Managed) != 0)
{
return true;
}
var flags = (TypeFlags)Util.ReadCLong(tp, TypeOffset.tp_flags);
return flags.HasFlag(TypeFlags.Managed);
}
return false;
}
Expand Down
0