Mercurial > pytave
changeset 100:ff70627aa203
Undef HAVE_STAT and HAVE_FSTAT consistently through-out all files
| author | David Grundberg <individ@acc.umu.se> |
|---|---|
| date | Mon, 09 Apr 2012 20:05:48 +0200 |
| parents | f8e9d39ef81b |
| children | 0c19ed1ce349 |
| files | ChangeLog octave_to_python.cc pytave.cc python_to_octave.cc |
| diffstat | 4 files changed, 25 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Apr 09 18:42:10 2012 +0200 +++ b/ChangeLog Mon Apr 09 20:05:48 2012 +0200 @@ -1,3 +1,8 @@ +2012-04-09 David Grundberg <individ@acc.umu.se> + + * octave_to_python.cc, python_to_octave.cc, pytave.cc: Undef + HAVE_STAT and HAVE_FSTAT consistently through-out all files. + 2012-04-09 David Grundberg <individ@acc.umu.se> * m4/ax_python_numpy.m4: Add missing link flags to test.
--- a/octave_to_python.cc Mon Apr 09 18:42:10 2012 +0200 +++ b/octave_to_python.cc Mon Apr 09 20:05:48 2012 +0200 @@ -21,7 +21,13 @@ #include <boost/python.hpp> #include <boost/python/numeric.hpp> #include <boost/type_traits/integral_constant.hpp> -#undef HAVE_STAT /* both boost::python and octave define HAVE_STAT... */ + +/* Both boost::python and octave define HAVE_STAT and HAVE_FSTAT. Ideally, + they shouldn't expose their configuration in the header files, but they do. + This silences the compiler warning. */ +#undef HAVE_STAT +#undef HAVE_FSTAT + #include <octave/oct.h> #include <octave/Matrix.h> #include <octave/ov.h>
--- a/pytave.cc Mon Apr 09 18:42:10 2012 +0200 +++ b/pytave.cc Mon Apr 09 20:05:48 2012 +0200 @@ -21,8 +21,12 @@ #include <boost/python.hpp> #include <boost/python/numeric.hpp> -#undef HAVE_STAT /* Both boost.python and octave define HAVE_STAT... */ -#undef HAVE_FSTAT /* Both boost.python and octave define HAVE_FSTAT... */ +/* Both boost::python and octave define HAVE_STAT and HAVE_FSTAT. Ideally, + they shouldn't expose their configuration in the header files, but they do. + This silences the compiler warning. */ +#undef HAVE_STAT +#undef HAVE_FSTAT + #include <octave/oct.h> #include <octave/oct-map.h>
--- a/python_to_octave.cc Mon Apr 09 18:42:10 2012 +0200 +++ b/python_to_octave.cc Mon Apr 09 20:05:48 2012 +0200 @@ -22,7 +22,13 @@ #include <boost/python.hpp> #include <boost/python/numeric.hpp> #include <boost/type_traits/integral_constant.hpp> -#undef HAVE_STAT /* both boost.python and octave defines HAVE_STAT... */ + +/* Both boost::python and octave define HAVE_STAT and HAVE_FSTAT. Ideally, + they shouldn't expose their configuration in the header files, but they do. + This silences the compiler warning. */ +#undef HAVE_STAT +#undef HAVE_FSTAT + #include <octave/oct.h> #include <octave/oct-map.h> #include <octave/Cell.h>