Commit d4ef1692 authored by Stefan Behnel's avatar Stefan Behnel

merge

parents 95f9cc5b 1e25b292
...@@ -645,6 +645,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -645,6 +645,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code.putln("#include <math.h>") code.putln("#include <math.h>")
code.putln("#define %s" % Naming.api_guard_prefix + self.api_name(env)) code.putln("#define %s" % Naming.api_guard_prefix + self.api_name(env))
self.generate_includes(env, cimported_modules, code) self.generate_includes(env, cimported_modules, code)
code.putln("")
code.putln("#ifdef PYREX_WITHOUT_ASSERTIONS")
code.putln("#define CYTHON_WITHOUT_ASSERTIONS")
code.putln("#endif")
code.putln("")
if env.directives['ccomplex']: if env.directives['ccomplex']:
code.putln("") code.putln("")
code.putln("#if !defined(CYTHON_CCOMPLEX)") code.putln("#if !defined(CYTHON_CCOMPLEX)")
......
...@@ -4000,7 +4000,7 @@ class AssertStatNode(StatNode): ...@@ -4000,7 +4000,7 @@ class AssertStatNode(StatNode):
gil_message = "Raising exception" gil_message = "Raising exception"
def generate_execution_code(self, code): def generate_execution_code(self, code):
code.putln("#ifndef PYREX_WITHOUT_ASSERTIONS") code.putln("#ifndef CYTHON_WITHOUT_ASSERTIONS")
self.cond.generate_evaluation_code(code) self.cond.generate_evaluation_code(code)
code.putln( code.putln(
"if (unlikely(!%s)) {" % "if (unlikely(!%s)) {" %
......
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