Skip to content

Commit

Permalink
Merge branch 'HDFGroup:develop' into develop-high-five
Browse files Browse the repository at this point in the history
  • Loading branch information
byrnHDF authored Nov 18, 2024
2 parents e33816a + 0cabed1 commit e39b555
Show file tree
Hide file tree
Showing 5 changed files with 1,215 additions and 572 deletions.
2 changes: 1 addition & 1 deletion bin/h5cc.in
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ case "$CC" in
kind="gcc"
;;
mpicc|mpcc|mpicc_r)
# Is this gcc masquarading as an MPI compiler?
# Is this gcc masquerading as an MPI compiler?
if test "`${CC} -v 2>&1 | sed -n 2p | cut -c1-3`" = "gcc"; then
kind="gcc"
else
Expand Down
2 changes: 1 addition & 1 deletion c++/src/h5c++.in
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ case "$CXX" in
kind="gcc"
;;
mpicc|mpcc|mpicc_r)
# Is this gcc masquarading as an MPI compiler?
# Is this gcc masquerading as an MPI compiler?
if test "`${CXX} -v 2>&1 | sed -n 2p | cut -c1-3`" = "gcc"; then
kind="gcc"
else
Expand Down
2 changes: 1 addition & 1 deletion test/farray.c
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@ main(void)
"skipping to last element");

/* Create Fixed Array */
/* MAX_NELMTS succeeds on some platforms buy may fail on others:
/* MAX_NELMTS succeeds on some platforms but may fail on others:
*
* "H5FD_sec2_truncate(): unable to extend file properly"
*
Expand Down
Loading

0 comments on commit e39b555

Please sign in to comment.