Commit d2797186 authored by Mark Florisson's avatar Mark Florisson

Fix master incompatibilities after rebase

parent 21118651
......@@ -86,7 +86,7 @@ class IntroduceBufferAuxiliaryVars(CythonTransform):
# Declare auxiliary vars
def decvar(type, prefix):
cname = scope.mangle(prefix, name)
aux_var = scope.declare_var(name="$%s" % cname, cname=cname,
aux_var = scope.declare_var(name=None, cname=cname,
type=type, pos=node.pos)
if entry.is_arg:
aux_var.used = True # otherwise, NameNode will mark whether it is used
......
......@@ -2828,6 +2828,9 @@ class DefNode(FuncDefNode):
"%s = %s;" % (
arg.entry.cname,
arg.calculate_default_value_code(code)))
if arg.entry.type.is_memoryviewslice:
code.put_incref_memoryviewslice(arg.entry.cname,
have_gil=True)
code.putln('}')
code.putln('}')
......
......@@ -422,6 +422,7 @@ class MemoryViewSliceType(PyrexType):
visibility='extern')
scope.parent_type = self
scope.directives = {}
scope.declare_var('_data', c_char_ptr_type, None,
cname='data', is_cdef=1)
......
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