This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rGba49d39b20cc: Use `<stdatomic.h>` with MSVC and C++ (authored by fsb4000, committed by Mordante).
Changed prior to commit: https://reviews.llvm.org/D130419?vs=447388&id=447390#toc Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D130419/new/ https://reviews.llvm.org/D130419 Files: clang/docs/ReleaseNotes.rst clang/lib/Headers/stdatomic.h Index: clang/lib/Headers/stdatomic.h =================================================================== --- clang/lib/Headers/stdatomic.h +++ clang/lib/Headers/stdatomic.h @@ -17,7 +17,8 @@ * explicitly disallows `stdatomic.h` in the C mode via an `#error`. Fallback * to the clang resource header until that is fully supported. */ -#if __STDC_HOSTED__ && __has_include_next(<stdatomic.h>) && !defined(_MSC_VER) +#if __STDC_HOSTED__ && \ + __has_include_next(<stdatomic.h>) && !(defined(_MSC_VER) && !defined(__cplusplus)) # include_next <stdatomic.h> #else Index: clang/docs/ReleaseNotes.rst =================================================================== --- clang/docs/ReleaseNotes.rst +++ clang/docs/ReleaseNotes.rst @@ -196,6 +196,8 @@ used in comparison operators. Fixes `Issue 56560 <https://github.com/llvm/llvm-project/issues/56560>`_. - Fix that ``if consteval`` could evaluate to ``true`` at runtime because it was incorrectly constant folded. Fixes `Issue 55638 <https://github.com/llvm/llvm-project/issues/55638>`_. +- Fixed incompatibility of Clang's ``<stdatomic.h>`` with MSVC ``<atomic>``. + Fixes `MSVC STL Issue 2862 <https://github.com/microsoft/STL/issues/2862>`_. Improvements to Clang's diagnostics ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Index: clang/lib/Headers/stdatomic.h =================================================================== --- clang/lib/Headers/stdatomic.h +++ clang/lib/Headers/stdatomic.h @@ -17,7 +17,8 @@ * explicitly disallows `stdatomic.h` in the C mode via an `#error`. Fallback * to the clang resource header until that is fully supported. */ -#if __STDC_HOSTED__ && __has_include_next(<stdatomic.h>) && !defined(_MSC_VER) +#if __STDC_HOSTED__ && \ + __has_include_next(<stdatomic.h>) && !(defined(_MSC_VER) && !defined(__cplusplus)) # include_next <stdatomic.h> #else Index: clang/docs/ReleaseNotes.rst =================================================================== --- clang/docs/ReleaseNotes.rst +++ clang/docs/ReleaseNotes.rst @@ -196,6 +196,8 @@ used in comparison operators. Fixes `Issue 56560 <https://github.com/llvm/llvm-project/issues/56560>`_. - Fix that ``if consteval`` could evaluate to ``true`` at runtime because it was incorrectly constant folded. Fixes `Issue 55638 <https://github.com/llvm/llvm-project/issues/55638>`_. +- Fixed incompatibility of Clang's ``<stdatomic.h>`` with MSVC ``<atomic>``. + Fixes `MSVC STL Issue 2862 <https://github.com/microsoft/STL/issues/2862>`_. Improvements to Clang's diagnostics ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
