From c9974daec2b286acd41b8d4a35bc04be059f54c8 Mon Sep 17 00:00:00 2001 From: Jim Bosch Date: Sat, 24 Aug 2013 18:08:01 -0400 Subject: [PATCH] Avoid Python 3 compile warnings in NumPy initialization --- libs/numpy/src/numpy.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/numpy/src/numpy.cpp b/libs/numpy/src/numpy.cpp index 883d9716..0cc3f5f6 100644 --- a/libs/numpy/src/numpy.cpp +++ b/libs/numpy/src/numpy.cpp @@ -12,9 +12,19 @@ namespace boost namespace numpy { +#if PY_MAJOR_VERSION == 2 +static void wrap_import_array() { + import_array(); +} +#else +static void * wrap_import_array() { + import_array(); +} +#endif + void initialize(bool register_scalar_converters) { - import_array(); + wrap_import_array(); import_ufunc(); if (register_scalar_converters) dtype::register_scalar_converters();