mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes that are only in 1.14 branch (#3704)

Browse Source
This commit is contained in:
jhendersonHDF 2023-10-17 23:54:40 -05:00 committed by GitHub
parent fc788559f7
commit 9557256819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakePresets.json
View File

@ -263,4 +263,5 @@
]
}
]
}
}

3
config/cmake-presets/hidden-presets.json
View File

@ -488,4 +488,5 @@
]
}
]
}
}

2
config/cmake/ConfigureChecks.cmake
View File

@ -909,7 +909,7 @@ endmacro ()
#-----------------------------------------------------------------------------
# ----------------------------------------------------------------------
# Set the flag to indicate that the machine is using a special algorithm toconvert
# Set the flag to indicate that the machine is using a special algorithm to convert
# 'long double' to '(unsigned) long' values. (This flag should only be set for
# the IBM Power Linux. When the bit sequence of long double is
# 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long

16
config/cmake/runTest.cmake
View File

@ -218,14 +218,6 @@ if (NOT TEST_SKIP_COMPARE)
file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
list (LENGTH TEST_STREAM test_len)
if (test_len GREATER 0)
# if (WIN32) # no longer needed for CMake > 3.15
# configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
# if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
# file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
# endif ()
# #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
# #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
# endif ()
if (NOT TEST_SORT_COMPARE)
# now compare the output with the reference
@ -293,14 +285,6 @@ if (NOT TEST_SKIP_COMPARE)
file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
list (LENGTH TEST_STREAM test_len)
if (test_len GREATER 0)
# if (WIN32) # no longer needed for CMake > 3.15
# configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
# if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
# file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
# endif ()
# #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
# #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
# endif ()
# now compare the error output with the error reference
execute_process (

3
config/sanitizer/README.md
View File

@ -304,4 +304,5 @@ file(GLOB_RECURSE CMAKE_FILES
)
cmake_format(TARGET_NAME ${CMAKE_FILES})
```
```

2
doxygen/examples/H5D_examples.c
View File

@ -10,7 +10,7 @@ int
chunk_cb(const hsize_t *offset, unsigned filter_mask, haddr_t addr, hsize_t size, void *op_data)
{
// only print the allocated chunk size only
printf("%ld\n", size);
printf("%" PRIuHSIZE "\n", size);
return EXIT_SUCCESS;
}
//! <!-- [H5Dchunk_iter_cb] -->

1
fortran/src/H5Fff.F90
View File

@ -43,6 +43,7 @@ MODULE H5F
! Number of objects opened in H5open_f
INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ
#ifndef H5_DOXYGEN
INTERFACE
INTEGER(C_INT) FUNCTION h5fis_accessible(name, &

3
fortran/src/H5Lff.F90
View File

@ -753,6 +753,9 @@ CONTAINS
hdferr = 0
IF(link_exists_c.LT.0_C_INT) hdferr = -1
hdferr = 0
IF(link_exists_c.LT.0) hdferr = -1
END SUBROUTINE h5lexists_f
!>

1
src/H5Olayout.c
View File

@ -591,6 +591,7 @@ H5O__layout_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNU
/* Avoid zero-size allocation */
mesg->storage.u.virt.list = NULL;
}
mesg->storage.u.virt.list_nalloc = (size_t)tmp_hsize;
mesg->storage.u.virt.list_nused = (size_t)tmp_hsize;

2
tools/test/misc/talign.c
View File

@ -179,7 +179,7 @@ out:
" %6f = %f\n",
(double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0],
(double)fptr[2], (double)fnok[1], (double)fptr[3]);
puts("*FAILED - compound type alignmnent problem*");
puts("*FAILED - compound type alignment problem*");
}
else {
puts(" PASSED");