nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 09:19:36 +01:00
Code Activity

Remove static data from headers

Browse source 
We don't want to duplicate any of these across libraries, which is what
happens when the platform doesn't support unique symbols.
This commit is contained in:
David McFarland 2025-11-12 19:52:29 -04:00
parent 3645671570
commit 1b5af49fd0
10 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/include/nix/expr/primops.hh
View file

@ -12,11 +12,7 @@ struct RegisterPrimOp
{
typedef std::vector<PrimOp> PrimOps;
static PrimOps & primOps()
{
static PrimOps primOps;
return primOps;
}
static PrimOps & primOps();
/**
* You can register a constant by passing an arity of 0. fun

2
src/libexpr/include/nix/expr/print-options.hh
View file

@ -110,7 +110,7 @@ struct PrintOptions
* `PrintOptions` for unknown and therefore potentially large values in error messages,
* to avoid printing "too much" output.
*/
static PrintOptions errorPrintOptions = PrintOptions{
static constexpr PrintOptions errorPrintOptions = PrintOptions{
.ansiColors = true,
.maxDepth = 10,
.maxAttrs = 10,

6
src/libexpr/primops.cc
View file

@ -40,6 +40,12 @@
namespace nix {
RegisterPrimOp::PrimOps & RegisterPrimOp::primOps()
{
static RegisterPrimOp::PrimOps primOps;
return primOps;
}
/*************************************************************
* Miscellaneous
*************************************************************/