boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-24 06:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Adjust NumPy code to work with new directory / namespace structure.

Browse Source
This commit is contained in:
Stefan Seefeld
2016-10-07 20:15:54 -04:00
parent cbb3851488
commit 3ace4a0015
53 changed files with 1200 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/numpy/numpy.cpp
View File

@@ -1,24 +1,24 @@
// Copyright Jim Bosch 2010-2012.
// Copyright Stefan Seefeld 2016.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_NUMPY_INTERNAL_MAIN
#include <boost/numpy/internal.hpp>
#include <boost/numpy/dtype.hpp>
#define BOOST_PYTHON_NUMPY_INTERNAL_MAIN
#include <boost/python/numpy/internal.hpp>
#include <boost/python/numpy/dtype.hpp>
namespace boost
{
namespace numpy
{
namespace boost { namespace python { namespace numpy {
#if PY_MAJOR_VERSION == 2
static void wrap_import_array() {
import_array();
static void wrap_import_array()
{
import_array();
}
#else
static void * wrap_import_array() {
import_array();
static void * wrap_import_array()
{
import_array();
}
#endif
@@ -30,5 +30,4 @@ void initialize(bool register_scalar_converters)
dtype::register_scalar_converters();
}
}
}
}}} // namespace boost::python::numpy