Skip to content

Commit

Permalink
Add support for the new MSVC preprocessor (HDFGroup#4078)
Browse files Browse the repository at this point in the history
Microsoft has added a new, standards-conformant preprocessor
to MSVC, which can be enabled with /Zc:preprocessor. This
preprocessor trips over our HDopen() function-like variadic
macro since it uses a hack that only works with the legacy
MSVC preprocessor.

This fix adds ifdefs to use the correct HDopen() macro
depending on the MSVC preprocessor selected.

Fixes HDFGroup#2515
  • Loading branch information
derobins authored and lrknox committed Mar 21, 2024
1 parent 769eb4b commit 1b75cfd
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
15 changes: 15 additions & 0 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,21 @@ New Features

Configuration:
-------------
- Added support for the new MSVC preprocessor

Microsoft added support for a new, standards-conformant preprocessor
to MSVC, which can be enabled with the /Zc:preprocessor option. This
preprocessor would trip over our HDopen() variadic function-like
macro, which uses a feature that only works with the legacy preprocessor.

ifdefs have been added that select the correct HDopen() form and
allow building HDF5 with the /Zc:preprocessor option.

The HDopen() macro is located in an internal header file and only
affects building the HDF5 library from source.

Fixes GitHub #2515

- Renamed HDF5_ENABLE_USING_MEMCHECKER to HDF5_USING_ANALYSIS_TOOL

The HDF5_USING_ANALYSIS_TOOL is used to indicate to test macros that
Expand Down
12 changes: 9 additions & 3 deletions src/H5win32defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,18 @@ struct timezone {
#define HDlstat(S, B) _lstati64(S, B)
#define HDmkdir(S, M) _mkdir(S)

/* Note that the variadic HDopen macro is using a VC++ extension
* where the comma is dropped if nothing is passed to the ellipsis.
/* Note that with the traditional MSVC preprocessor, the variadic
* HDopen macro uses an MSVC-specific extension where the comma
* is dropped if nothing is passed to the ellipsis.
*
* MinGW and the newer, conforming MSVC preprocessor do not exhibit this
* behavior.
*/
#ifndef H5_HAVE_MINGW
#if (defined(_MSC_VER) && !defined(_MSVC_TRADITIONAL)) || _MSVC_TRADITIONAL
/* Using the MSVC traditional preprocessor */
#define HDopen(S, F, ...) Wopen_utf8(S, F, __VA_ARGS__)
#else
/* Using a standards conformant preprocessor */
#define HDopen(S, F, ...) Wopen_utf8(S, F, ##__VA_ARGS__)
#endif

Expand Down

0 comments on commit 1b75cfd

Please sign in to comment.