Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14741 from NixOS/better-variant-wrapper

Browse Source 
Fix `MAKE_WRAPPER_CONSTRUCTOR` to not override special constructors
This commit is contained in:
Sergei Zimmerman
2025-12-08 23:26:03 +00:00
committed by GitHub
parent bc0af77ba7 e73bb666c5
commit afc2b96c5e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libutil/include/nix/util/variant-wrapper.hh
View File

@@ -22,10 +22,12 @@
*
* The moral equivalent of `using Raw::Raw;`
*/
#define MAKE_WRAPPER_CONSTRUCTOR(CLASS_NAME) \
FORCE_DEFAULT_CONSTRUCTORS(CLASS_NAME) \
\
CLASS_NAME(auto &&... arg) \
: raw(std::forward<decltype(arg)>(arg)...) \
{ \
#define MAKE_WRAPPER_CONSTRUCTOR(CLASS_NAME) \
FORCE_DEFAULT_CONSTRUCTORS(CLASS_NAME) \
\
template<typename... Args> \
requires(!(sizeof...(Args) == 1 && (std::is_same_v<std::remove_cvref_t<Args>, CLASS_NAME> && ...))) \
CLASS_NAME(Args &&... arg) \
: raw(std::forward<Args>(arg)...) \
{ \
}