From 648c89e879f739f82ed6dba7df7243e54b98601f Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 11 Jan 2023 19:26:26 +0100 Subject: Rename ExternalX structs to external_x --- src/configure.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/configure.cc') diff --git a/src/configure.cc b/src/configure.cc index 40f4d27..129fa42 100644 --- a/src/configure.cc +++ b/src/configure.cc @@ -280,7 +280,7 @@ int regenerateCache(ctor::settings& settings, }); // Resolv externals - ExternalConfigurations externalConfigs; + ctor::external_configurations externalConfigs; for(std::size_t i = 0; i < numExternalConfigFiles; ++i) { auto newExternalConfigs = externalConfigFiles[i].cb(settings); @@ -312,7 +312,7 @@ int regenerateCache(ctor::settings& settings, std::visit([&](auto&& arg) { using T = std::decay_t; - if constexpr (std::is_same_v) + if constexpr (std::is_same_v) { add_path_args(ext.name); } @@ -470,10 +470,10 @@ int regenerateCache(ctor::settings& settings, { istr << " { \"" << ext.name << "\", {\n"; ctor::flags resolved_flags; - if(std::holds_alternative(ext.external)) + if(std::holds_alternative(ext.external)) { if(auto ret = resolv(settings, ext, - std::get(ext.external), + std::get(ext.external), resolved_flags)) { return ret; -- cgit v1.2.3