From 5ee0d5669e783438ede3ba5b2a66d4f474426c0f Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Tue, 5 Aug 2025 02:15:21 +0300 Subject: [PATCH] libstore: Move State to an anonymous namespace Having a State class in the nix namespace is asking for ODR trouble. This class is already private to the translation unit, let's move it into an anonymous namespace. --- src/libstore/builtins/buildenv.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libstore/builtins/buildenv.cc b/src/libstore/builtins/buildenv.cc index 0ff0be3aa..22ed8d807 100644 --- a/src/libstore/builtins/buildenv.cc +++ b/src/libstore/builtins/buildenv.cc @@ -10,12 +10,16 @@ namespace nix { +namespace { + struct State { std::map priorities; unsigned long symlinks = 0; }; +} // namespace + /* For each activated package, create symlinks */ static void createLinks(State & state, const Path & srcDir, const Path & dstDir, int priority) {