Commit 7e9f9e77 authored by Keith Bennett's avatar Keith Bennett

Merge tag 'v2.5.16' into devel

Version v2.5.16

# gpg: Signature made Tue 29 Nov 15:55:57 2016 GMT
# gpg:                using RSA key DB4F7D61DB1CE84F
# gpg: checking the trustdb
# gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
# gpg: depth: 0  valid:   3  signed:   2  trust: 0-, 0q, 0n, 0m, 0f, 3u
# gpg: depth: 1  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 2f, 0u
# gpg: next trustdb check due at 2017-07-24
# gpg: Good signature from "Keith Bennett <dr.keith.bennett@gmail.com>" [ultimate]
# gpg:                 aka "Keith Bennett <k.bennett@warwick.ac.uk>" [ultimate]
parents 8831f7ec d48ceabb
......@@ -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