Python: Reverted to Boost 1.55

2015-08-07 01:00:52 -07:00
parent 623c5f5e85
commit a986bc3a17
2823 changed files with 384926 additions and 12340 deletions
--- a/python/external/boost/libs/numpy/src/numpy.cpp
+++ b/python/external/boost/libs/numpy/src/numpy.cpp
@@ -12,19 +12,19 @@ namespace boost
 namespace numpy 
 {

-#if PY_MAJOR_VERSION == 2
-static void wrap_import_array() {
-    import_array();
-}
+#if PY_MAJOR_VERSION >= 3
+int
 #else
-static void * wrap_import_array() {
-    import_array();
-}
+void
 #endif
+do_import_array()
+{
+  import_array();
+}

 void initialize(bool register_scalar_converters) 
 {
-  wrap_import_array();
+  do_import_array();
  import_ufunc();
  if (register_scalar_converters)
 	dtype::register_scalar_converters();