Mercurial > pytave

comparison pytave.cc @ 84:8ee00dc40ae5 numpyconf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with lp:pytave/trunk.
author David <david@stacey>
date Sun, 20 Sep 2009 15:02:30 +0200
parents 8145ecfecfb9 fb227ceacc65
children 737d78f8495c
comparison
equal deleted inserted replaced
83:8145ecfecfb9 84:8ee00dc40ae5
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with Pytave. If not, see <http://www.gnu.org/licenses/>. 18 * along with Pytave. If not, see <http://www.gnu.org/licenses/>.
19 */ 19 */
20 20
21 #define PYTAVE_DO_DECLARE_SYMBOL
22 #include "arrayobjectdefs.h"
23 #include <boost/python.hpp> 21 #include <boost/python.hpp>
24 #include <boost/python/numeric.hpp> 22 #include <boost/python/numeric.hpp>
25 23
26 #undef HAVE_STAT /* Both boost.python and octave define HAVE_STAT... */ 24 #undef HAVE_STAT /* Both boost.python and octave define HAVE_STAT... */
27 #undef HAVE_FSTAT /* Both boost.python and octave define HAVE_FSTAT... */ 25 #undef HAVE_FSTAT /* Both boost.python and octave define HAVE_FSTAT... */
42 #include <sstream> 40 #include <sstream>
43 #include <sys/types.h> 41 #include <sys/types.h>
44 42
45 #include "pytavedefs.h" 43 #include "pytavedefs.h"
46 44
45 #define PYTAVE_DO_DECLARE_SYMBOL
46 #include "arrayobjectdefs.h"
47 #include "exceptions.h" 47 #include "exceptions.h"
48 #include "octave_to_python.h" 48 #include "octave_to_python.h"
49 #include "python_to_octave.h" 49 #include "python_to_octave.h"
50 50
51 using namespace boost::python; 51 using namespace boost::python;