merge with latest cython-devel
authorStefan Behnel <scoder@users.berlios.de>
Thu, 9 Apr 2009 10:52:20 +0000 (12:52 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 9 Apr 2009 10:52:20 +0000 (12:52 +0200)
1  2 
Cython/Compiler/ExprNodes.py
Cython/Compiler/Main.py
Cython/Compiler/Nodes.py
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/Symtab.py

Simple merge
Simple merge
index de52551e0b59a3d7f9fc615d0985a4057234ca37,706dbea7c4b2d3355bc7134efebdc88b02f2cf3e..8a5044b141ae5a8dbfa7ad45dfa616995027e57b
@@@ -539,10 -575,8 +541,9 @@@ class CFuncDeclaratorNode(CDeclaratorNo
          else:
              if self.exception_value:
                  self.exception_value.analyse_const_expression(env)
 +                exc_val = self.exception_value.get_constant_result_code()
                  if self.exception_check == '+':
                      exc_val_type = self.exception_value.type
-                     env.add_include_file('stdexcept')
                      if not exc_val_type.is_error 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):
Simple merge