From f02ed8b2c5a4b71dec7b51fb1ccb46352a3e2c95 Mon Sep 17 00:00:00 2001 From: Sascha Roloff Date: Thu, 22 Dec 2022 19:28:07 +0100 Subject: Configured target uses entity_name_data.hpp instead of entity_name.hpp This usage of a different header file is required to break a cyclic dependency coming with the introduction of the garbage collector. entity_name implicitly depends on local_cas, which will get a new dependency to garbage_collector. garbage_collector depends on target_cache_entry, which transitively depends on entity_name. entity_name_data instead does not depend on local_cas and breaks the cycle. --- src/buildtool/build_engine/target_map/TARGETS | 2 +- src/buildtool/build_engine/target_map/configured_target.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS index 702eaa3f..15e14142 100644 --- a/src/buildtool/build_engine/target_map/TARGETS +++ b/src/buildtool/build_engine/target_map/TARGETS @@ -4,7 +4,7 @@ , "hdrs": ["configured_target.hpp"] , "deps": [ ["@", "fmt", "", "fmt"] - , ["src/buildtool/build_engine/base_maps", "entity_name"] + , ["src/buildtool/build_engine/base_maps", "entity_name_data"] , ["src/buildtool/build_engine/expression", "expression"] , ["src/utils/cpp", "hash_combine"] ] diff --git a/src/buildtool/build_engine/target_map/configured_target.hpp b/src/buildtool/build_engine/target_map/configured_target.hpp index 15601d71..c8183b4f 100644 --- a/src/buildtool/build_engine/target_map/configured_target.hpp +++ b/src/buildtool/build_engine/target_map/configured_target.hpp @@ -18,7 +18,7 @@ #include #include "fmt/core.h" -#include "src/buildtool/build_engine/base_maps/entity_name.hpp" +#include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/utils/cpp/hash_combine.hpp" -- cgit v1.2.3