Mercurial > pytave
changeset 75:b0991511a16d
a few fixes to numpy support
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Tue, 15 Sep 2009 11:23:36 +0200 |
| parents | 6517417e75b2 |
| children | ba609c4d77db |
| files | ChangeLog octave_to_python.cc python_to_octave.cc setup.py.in |
| diffstat | 4 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 03 13:49:19 2009 +0200 +++ b/ChangeLog Tue Sep 15 11:23:36 2009 +0200 @@ -1,3 +1,10 @@ +2009-09-15 Jaroslav Hajek <highegg@gmail.com> + + * octave_to_python.cc: Move #include of arrayobjectdefs after + pytavedefs to ensure config.h is included. + * python_to_octave.cc: Ditto. + * setup.py.in: Undo leaked local paths. + 2009-07-03 David Grundberg <individ@acc.umu.se> * pytave.cc: Sorted includes.
--- a/octave_to_python.cc Fri Jul 03 13:49:19 2009 +0200 +++ b/octave_to_python.cc Tue Sep 15 11:23:36 2009 +0200 @@ -18,7 +18,6 @@ * along with Pytave. If not, see <http://www.gnu.org/licenses/>. */ -#include "arrayobjectdefs.h" #include <boost/python.hpp> #include <boost/python/numeric.hpp> #include <boost/type_traits/integral_constant.hpp> @@ -30,6 +29,7 @@ #include <iostream> #include "pytavedefs.h" +#include "arrayobjectdefs.h" #include "exceptions.h" #include "octave_to_python.h"
--- a/python_to_octave.cc Fri Jul 03 13:49:19 2009 +0200 +++ b/python_to_octave.cc Tue Sep 15 11:23:36 2009 +0200 @@ -21,7 +21,6 @@ #include <iostream> #include <boost/python.hpp> #include <boost/python/numeric.hpp> -#include "arrayobjectdefs.h" #include <boost/type_traits/integral_constant.hpp> #undef HAVE_STAT /* both boost.python and octave defines HAVE_STAT... */ #include <octave/oct.h> @@ -31,6 +30,7 @@ #include <octave/ov.h> #include "pytavedefs.h" +#include "arrayobjectdefs.h" #include "exceptions.h" using namespace std;
--- a/setup.py.in Fri Jul 03 13:49:19 2009 +0200 +++ b/setup.py.in Tue Sep 15 11:23:36 2009 +0200 @@ -4,8 +4,7 @@ from distutils.core import setup, Extension, DistutilsModuleError -include_dirs = ['/usr/local/include/octave-3.1.55', - '/home/hajek/devel/pytave-repo/pytave', '.'] # Python always included. +include_dirs = ['@OCTAVE_INCLUDEDIR@', '@abs_builddir@', '@srcdir@'] # Python always included. # check for numpy. If it exists, define the path.