Skip to content

Commit

Permalink
Merge remote-tracking branch 'canonical/develop' into gcc_13_support
Browse files Browse the repository at this point in the history
  • Loading branch information
derobins committed Oct 20, 2024
2 parents ceb5e1e + 680cdd0 commit 46eb04d
Show file tree
Hide file tree
Showing 17 changed files with 6,374 additions and 36 deletions.
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,7 @@ m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
src/H5Edefin.h
src/H5Einit.h
src/H5Emajdef.h
src/H5Emindef.h
src/H5Epubgen.h
src/H5Eterm.h
src/H5config.h.in
src/H5overflow.h
src/H5version.h

/.classpath
/CMakeUserPresets.json
Expand Down
2 changes: 0 additions & 2 deletions bin/genparser
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ do
echo '#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 600 ' >> tmp.out
echo '#pragma GCC diagnostic ignored "-Wnull-dereference" ' >> tmp.out
echo '#endif ' >> tmp.out
echo '#elif defined __SUNPRO_CC ' >> tmp.out
echo '#pragma disable_warn ' >> tmp.out
echo '#elif defined _MSC_VER ' >> tmp.out
echo '#pragma warning(push, 1) ' >> tmp.out
echo '#endif ' >> tmp.out
Expand Down
21 changes: 7 additions & 14 deletions config/cmake/ConfigureChecks.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set (${HDF_PREFIX}_HAVE_DARWIN 1)
endif ()

# Check for Solaris
if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
set (${HDF_PREFIX}_HAVE_SOLARIS 1)
endif ()

#-----------------------------------------------------------------------------
# This MACRO checks IF the symbol exists in the library and IF it
# does, it appends library to the list.
Expand Down Expand Up @@ -437,16 +432,14 @@ endif ()
#-----------------------------------------------------------------------------
# Check a bunch of other functions
#-----------------------------------------------------------------------------
if (MINGW OR NOT WINDOWS)
foreach (other_test
HAVE_ATTRIBUTE
HAVE_BUILTIN_EXPECT
PTHREAD_BARRIER
HAVE_SOCKLEN_T
foreach (other_test
HAVE_ATTRIBUTE
HAVE_BUILTIN_EXPECT
PTHREAD_BARRIER
HAVE_SOCKLEN_T
)
HDF_FUNCTION_TEST (${other_test})
endforeach ()
endif ()
HDF_FUNCTION_TEST (${other_test})
endforeach ()

# ----------------------------------------------------------------------
# Set the flag to indicate that the machine can handle converting
Expand Down
2 changes: 0 additions & 2 deletions hl/src/H5LTanalyze.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 600
#pragma GCC diagnostic ignored "-Wnull-dereference"
#endif
#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
#endif
Expand Down
2 changes: 0 additions & 2 deletions hl/src/H5LTparse.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 600
#pragma GCC diagnostic ignored "-Wnull-dereference"
#endif
#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
#endif
Expand Down
21 changes: 21 additions & 0 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,27 @@ New Features

Configuration:
-------------
- Generated files in src are now checked into version control

These files are infrequently updated and generating them adds a
dependency on Perl. The listed files are now checked in and do
not need to be recreated when checking out development branches.

* H5Edefin.h
* H5Einit.h
* H5Emajdef.h
* H5Emindef.h
* H5Epubgen.h
* H5Eterm.h
* H5overflow.h
* H5version.h

- Dropped some old Solaris Studio work-arounds

Solaris Studio no longer seems to be maintained and the last version
(12.4, circa 2015) doesn't seem to fully support C11. We've removed
some hacks that work around things like __attribute__() support.

- Dropped support for the traditional MSVC preprocessor

Visual Studio has recently started using a standards-compliant
Expand Down
255 changes: 255 additions & 0 deletions src/H5Edefin.h

Large diffs are not rendered by default.

Loading

0 comments on commit 46eb04d

Please sign in to comment.