research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified numpy/numarray include to avoid confusing SCons

Browse source
This commit is contained in:
Ray Speth 2011-12-14 19:42:23 +00:00
parent 2cf75e969e
commit e205c27475
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cantera/python/src/pycantera.cpp
View file

@ -17,20 +17,14 @@
#ifdef HAS_NUMERIC
#include "Numeric/arrayobject.h"
#else
#endif
#ifdef HAS_NUMARRAY
#include "numarray/arrayobject.h"
#else
#endif
#ifdef HAS_NUMPY
#include "numpy/arrayobject.h"
#else
// Create a compilation error to cause the program to bomb
#include "Numeric/arrayobject.h"
#include "numarray/arrayobject.h"
#include "numpy/libnumarray.h"
#include "numpy/arrayobject.h"
#endif
#endif
#endif
#include "clib/ct.h"