Commit 6f457b91 authored by Robert Bradshaw's avatar Robert Bradshaw

Fix e_nogilcmeth

parent 11a91a05
...@@ -699,6 +699,8 @@ class CFuncType(CType): ...@@ -699,6 +699,8 @@ class CFuncType(CType):
return 0 return 0
if not self.same_calling_convention_as(other_type): if not self.same_calling_convention_as(other_type):
return 0 return 0
if self.nogil != other_type.nogil:
return 0
return 1 return 1
def compatible_signature_with(self, other_type, as_cmethod = 0): def compatible_signature_with(self, other_type, as_cmethod = 0):
...@@ -731,6 +733,8 @@ class CFuncType(CType): ...@@ -731,6 +733,8 @@ class CFuncType(CType):
return 0 return 0
if not self.same_calling_convention_as(other_type): if not self.same_calling_convention_as(other_type):
return 0 return 0
if self.nogil != other_type.nogil:
return 0
self.original_sig = other_type.original_sig or other_type self.original_sig = other_type.original_sig or other_type
if as_cmethod: if as_cmethod:
self.args[0] = other_type.args[0] self.args[0] = other_type.args[0]
......
cdef class C:
cdef void f(self)
cdef class C: cdef class C:
cdef void f(self): cdef void f(self) nogil:
pass pass
_ERRORS = u""" _ERRORS = u"""
/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_nogilcmeth.pyx:2:6: Signature does not match previous declaration /Local/Projects/D/Pyrex/Source/Tests/Errors3/e_nogilcmeth.pyx:2:6: Signature not compatible with previous declaration
/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_nogilcmeth.pxd:2:12: Previous declaration is here /Local/Projects/D/Pyrex/Source/Tests/Errors3/e_nogilcmeth.pxd:2:12: Previous declaration is here
""" """
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment