diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2017-01-23 20:50:20 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2017-01-23 20:50:20 (GMT) |
| commit | b7acf7dd3b44c9263476c884f57e6c0edb811c49 (patch) | |
| tree | cf51582a50a6bac9bce75a52702449935b624c35 | |
| parent | bc92cb34f771e7b94bf7d72d16a8afab9e56f013 (diff) | |
| parent | a804e413fecd2899fe975af391c51a80caacdb16 (diff) | |
| download | hdf5-b7acf7dd3b44c9263476c884f57e6c0edb811c49.zip hdf5-b7acf7dd3b44c9263476c884f57e6c0edb811c49.tar.gz hdf5-b7acf7dd3b44c9263476c884f57e6c0edb811c49.tar.bz2 | |
Merge pull request #262 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_8 to hdf5_1_8
* commit 'a804e413fecd2899fe975af391c51a80caacdb16':
Removed some C++-style comments from H5Omtime.c. Fixes HDFFV-10110.
| -rw-r--r-- | src/H5Omtime.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/H5Omtime.c b/src/H5Omtime.c index fdd9a31..58cc2c1 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -179,10 +179,11 @@ H5O_mtime_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5 int i; struct tm tm; void *ret_value = NULL; /* Return value */ -#if _MSC_VER >= 1900 // VS 2015 -// In gcc and in Visual Studio prior to VS 2015 'timezone' is a global -// variable declared in time.h. That variable was deprecated and in VS 2015 -// is removed, with _get_timezone replacing it. +#if _MSC_VER >= 1900 /* VS 2015 */ + /* In gcc and in Visual Studio prior to VS 2015 'timezone' is a global + * variable declared in time.h. That variable was deprecated and in VS 2015 + * is removed, with _get_timezone replacing it. + */ long timezone = 0; #endif @@ -225,7 +226,7 @@ H5O_mtime_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5 /* BSD-like systems */ the_time += tm.tm_gmtoff; #elif defined(H5_HAVE_TIMEZONE) - #if _MSC_VER >= 1900 // VS 2015 + #if _MSC_VER >= 1900 /* VS 2015 */ HDget_timezone(&timezone); #endif /* GNU/Linux systems */ |