Commit d48ceabb authored by Keith Bennett's avatar Keith Bennett

Merge branch 'hotfix/2.5.16'

parents d58e661a 6a3d5363
......@@ -30,7 +30,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.15"
#define VERSION "2.4.16"
#define DBG_FLUSH() do { \
if (h && h->dbg_buf) { \
......
......@@ -592,7 +592,8 @@ static PyObject *Block_getdata(Block *block, void *closure)
sdf_block_t *b = block->b;
PyObject *ob;
ArrayObject *array = NULL;
Py_ssize_t ndims, n, i, j;
Py_ssize_t ndims, n;
volatile Py_ssize_t i, j;
npy_intp *dims;
npy_intp adims[1];
void *mem;
......@@ -1583,7 +1584,7 @@ MOD_INIT(sdf)
if (!m)
return MOD_ERROR_VAL;
PyModule_AddStringConstant(m, "__version__", "2.4.15");
PyModule_AddStringConstant(m, "__version__", "2.4.16");
PyModule_AddStringConstant(m, "__commit_id__", SDF_COMMIT_ID);
PyModule_AddStringConstant(m, "__commit_date__", SDF_COMMIT_DATE);
s = sdf_get_library_commit_id();
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.15"
#define VERSION "2.4.16"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define ABS(a) (((a) < 0.0) ? -(a) : (a))
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.15"
#define VERSION "2.4.16"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment