diff options
| author | scoder <stefan_ml@behnel.de> | 2017-06-25 23:48:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-25 23:48:30 +0200 |
| commit | 8d727b674868d9fa441ef15ecde44ecbf273f809 (patch) | |
| tree | 6e91b02ed53ee077a89816bb3cc63f53f9d7c14e /Cython/Compiler/Symtab.py | |
| parent | 8705f0fa37f677cce90997d0aa271a441e11bdc0 (diff) | |
| parent | 4f857124d93b3d1ea9a4627bd831526cda35870a (diff) | |
| download | cython-8d727b674868d9fa441ef15ecde44ecbf273f809.tar.gz | |
Merge branch 'master' into feature/pythran
Diffstat (limited to 'Cython/Compiler/Symtab.py')
| -rw-r--r-- | Cython/Compiler/Symtab.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Cython/Compiler/Symtab.py b/Cython/Compiler/Symtab.py index 2c0ce1d47..b52666fce 100644 --- a/Cython/Compiler/Symtab.py +++ b/Cython/Compiler/Symtab.py @@ -2098,7 +2098,8 @@ class CClassScope(ClassScope): # Fix with_gil vs nogil. entry.type = entry.type.with_with_gil(type.with_gil) elif type.compatible_signature_with(entry.type, as_cmethod = 1) and type.nogil == entry.type.nogil: - if self.defined and not in_pxd: + if (self.defined and not in_pxd + and not type.same_c_signature_as_resolved_type(entry.type, as_cmethod = 1, as_pxd_definition = 1)): error(pos, "Compatible but non-identical C method '%s' not redeclared " "in definition part of extension type '%s'" % (name, self.class_name)) |