mirror of
https://github.com/NixOS/nix
synced 2025-06-25 06:31:14 +02:00
Eliminate the "store" global variable
Also, move a few free-standing functions into StoreAPI and Derivation. Also, introduce a non-nullable smart pointer, ref<T>, which is just a wrapper around std::shared_ptr ensuring that the pointer is never null. (For reference-counted values, this is better than passing a "T&", because the latter doesn't maintain the refcount. Usually, the caller will have a shared_ptr keeping the value alive, but that's not always the case, e.g., when passing a reference to a std::thread via std::bind.)
This commit is contained in:
parent
4f7824c58e
commit
c10c61449f
36 changed files with 511 additions and 458 deletions
|
@ -91,8 +91,8 @@ int main(int argc, char * * argv)
|
|||
if (args.size() > 2)
|
||||
throw UsageError("too many arguments");
|
||||
|
||||
store = openStore();
|
||||
EvalState state(searchPath);
|
||||
auto store = openStore();
|
||||
EvalState state(searchPath, store);
|
||||
|
||||
Bindings & autoArgs(*evalAutoArgs(state, autoArgs_));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue