Commit 2337909d authored by Robert Bradshaw's avatar Robert Bradshaw

Include stdexcept in all cases.

parent 83323b2d
...@@ -565,6 +565,8 @@ class CFuncDeclaratorNode(CDeclaratorNode): ...@@ -565,6 +565,8 @@ class CFuncDeclaratorNode(CDeclaratorNode):
exc_val = None exc_val = None
exc_check = 0 exc_check = 0
if self.exception_check == '+':
env.add_include_file('stdexcept')
if return_type.is_pyobject \ if return_type.is_pyobject \
and (self.exception_value or self.exception_check) \ and (self.exception_value or self.exception_check) \
and self.exception_check != '+': and self.exception_check != '+':
...@@ -575,7 +577,6 @@ class CFuncDeclaratorNode(CDeclaratorNode): ...@@ -575,7 +577,6 @@ class CFuncDeclaratorNode(CDeclaratorNode):
self.exception_value.analyse_const_expression(env) self.exception_value.analyse_const_expression(env)
if self.exception_check == '+': if self.exception_check == '+':
exc_val_type = self.exception_value.type exc_val_type = self.exception_value.type
env.add_include_file('stdexcept')
if not exc_val_type.is_error and \ if not exc_val_type.is_error and \
not exc_val_type.is_pyobject and \ not exc_val_type.is_pyobject and \
not (exc_val_type.is_cfunction and not exc_val_type.return_type.is_pyobject and len(exc_val_type.args)==0): not (exc_val_type.is_cfunction and not exc_val_type.return_type.is_pyobject and len(exc_val_type.args)==0):
......
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