diff options
| author | David Young <dyoung@hdfgroup.org> | 2022-03-10 19:54:20 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 19:54:20 (GMT) |
| commit | 1fb3743f04df101c7245ce045b67d371d462fd70 (patch) | |
| tree | b7336b3d48e8016e3967b9175223b4230149bd9c /src | |
| parent | b9470be379354af209daf8418b6c571dde99e776 (diff) | |
| download | hdf5-1fb3743f04df101c7245ce045b67d371d462fd70.zip hdf5-1fb3743f04df101c7245ce045b67d371d462fd70.tar.gz hdf5-1fb3743f04df101c7245ce045b67d371d462fd70.tar.bz2 | |
Fix JNI bug, fix warnings noticed in MSVC CI, be modern & portable (#1480)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5VMprivate.h | 4 | ||||
| -rw-r--r-- | src/H5system.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h index 0d3bd0f..e773bae 100644 --- a/src/H5VMprivate.h +++ b/src/H5VMprivate.h @@ -393,8 +393,8 @@ static const unsigned char LogTable256[] = { static inline unsigned H5_ATTR_UNUSED H5VM_log2_gen(uint64_t n) { - unsigned r; /* r will be log2(n) */ - register unsigned int t, tt, ttt; /* temporaries */ + unsigned r; /* r will be log2(n) */ + unsigned int t, tt, ttt; /* temporaries */ if ((ttt = (unsigned)(n >> 32))) if ((tt = (unsigned)(n >> 48))) diff --git a/src/H5system.c b/src/H5system.c index ee9077e..a369e3d 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -862,7 +862,7 @@ H5_nanosleep(uint64_t nanosec) #else - const uint64_t nanosec_per_sec = 1000 * 1000 * 1000; + const uint64_t nanosec_per_sec = 1000 * 1000L * 1000; struct timespec sleeptime; /* Struct to hold time to sleep */ /* Set up time to sleep @@ -1033,7 +1033,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct HDfree(arg); } else { - register char *cp; /* pointer into current token */ + char *cp; /* pointer into current token */ /* short command line option */ optchar = argv[H5_optind][sp]; |