Commit 8458a4c4 authored by Keith Bennett's avatar Keith Bennett

Merge tag 'v2.5.17' into devel

Version v2.5.17

# gpg: Signature made Tue 13 Dec 11:41:17 2016 GMT
# gpg:                using RSA key DB4F7D61DB1CE84F
# gpg: Good signature from "Keith Bennett <k.bennett@warwick.ac.uk>" [ultimate]
# gpg:                 aka "Keith Bennett <dr.keith.bennett@gmail.com>" [ultimate]
parents 7e9f9e77 06b8c1e5
......@@ -30,7 +30,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.16"
#define VERSION "2.4.17"
#define DBG_FLUSH() do { \
if (h && h->dbg_buf) { \
......
......@@ -1584,7 +1584,7 @@ MOD_INIT(sdf)
if (!m)
return MOD_ERROR_VAL;
PyModule_AddStringConstant(m, "__version__", "2.4.16");
PyModule_AddStringConstant(m, "__version__", "2.4.17");
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.16"
#define VERSION "2.4.17"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define ABS(a) (((a) < 0.0) ? -(a) : (a))
......@@ -507,7 +507,7 @@ char **parse_args(int *argc, char ***argv)
exit(1);
}
err = parse_range(optarg, &range_list, &nrange, &nrange_max);
if (!err) {
if (err) {
if (!variable_ids) {
variable_last_id =
variable_ids = malloc(sizeof(*variable_ids));
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.16"
#define VERSION "2.4.17"
#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