Author: Corentin Jabot Date: 2022-11-30T11:27:16+01:00 New Revision: 4403c4f9e77e673a2771edfc7ab0ebb234e97485
URL: https://github.com/llvm/llvm-project/commit/4403c4f9e77e673a2771edfc7ab0ebb234e97485 DIFF: https://github.com/llvm/llvm-project/commit/4403c4f9e77e673a2771edfc7ab0ebb234e97485.diff LOG: [Clang] Remove conflict markers from ReleaseNotes Added: Modified: clang/docs/ReleaseNotes.rst Removed: ################################################################################ diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index c0dfc3ccb5a5..6ac35d48ccab 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -616,16 +616,13 @@ C++ Language Changes in Clang conforming GNU extensions. Projects incompatible with C++17 can add ``-std=gnu++14`` to their build settings to restore the previous behaviour. - Implemented DR2358 allowing init captures in lambdas in default arguments. -<<<<<<< HEAD - implemented `DR2654 <https://wg21.link/cwg2654>`_ which undeprecates all compound assignements operations on volatile qualified variables. -======= - Implemented DR2631. Invalid ``consteval`` calls in default arguments and default member initializers are diagnosed when and if the default is used. This Fixes `Issue 56379 <https://github.com/llvm/llvm-project/issues/56379>`_ and changes the value of ``std::source_location::current()`` used in default parameters calls compared to previous versions of Clang. ->>>>>>> 7c4d4089e1fd (Implement CWG2631) C++20 Feature Support ^^^^^^^^^^^^^^^^^^^^^ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
