diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-01-29 12:55:18 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-29 12:55:18 (GMT) |
commit | 6db183590fd04767e6d01c1e871a18e80101c192 (patch) | |
tree | 02c983224b59c2d5c2fd01805e162a48cf02a996 /src/H5timer.c | |
parent | 5a812bf5197e3394b92f5df8ee103a5eb80da18d (diff) | |
download | hdf5-6db183590fd04767e6d01c1e871a18e80101c192.zip hdf5-6db183590fd04767e6d01c1e871a18e80101c192.tar.gz hdf5-6db183590fd04767e6d01c1e871a18e80101c192.tar.bz2 |
develop revert source to clang-format version 11 (#293)
* OESS-98 convert plugin option to FetchContent, add tests
* Fixes for pkcfg files because of plugin option
* OESS-98 fix tools test for plugins
* Keep doxygen comments under 100 chars long - format hint
* Whitespace
* HDFFV-11144 - Reclassify CMake messages
* HDFFV-11099/11100 added help text
* Reworked switch statement to compare string instead
* Fix typo
* Update CDash mode
* Correct name of threadsafe
* Correct option name
* Undo accidental commit
* Note LLVM 10 to 11 format default changes
* Update format plugin
* Undo clang-format version 11 changes
* One more correction
Diffstat (limited to 'src/H5timer.c')
-rw-r--r-- | src/H5timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5timer.c b/src/H5timer.c index b637a16..b53c302 100644 --- a/src/H5timer.c +++ b/src/H5timer.c @@ -164,7 +164,7 @@ H5_now(void) HDgettimeofday(&now_tv, NULL); now = now_tv.tv_sec; } -#else /* H5_HAVE_GETTIMEOFDAY */ +#else /* H5_HAVE_GETTIMEOFDAY */ now = HDtime(NULL); #endif /* H5_HAVE_GETTIMEOFDAY */ @@ -202,8 +202,8 @@ H5_now_usec(void) HDgettimeofday(&now_tv, NULL); now = (uint64_t)(now_tv.tv_sec * (1000 * 1000)) + (uint64_t)now_tv.tv_usec; } -#else /* H5_HAVE_GETTIMEOFDAY */ - now = (uint64_t)(HDtime(NULL) * (1000 * 1000)); +#else /* H5_HAVE_GETTIMEOFDAY */ + now = (uint64_t)(HDtime(NULL) * (1000 * 1000)); #endif /* H5_HAVE_GETTIMEOFDAY */ return (now); |