From 2b26fff20c1684bc96eac25cfb24e1230f9ca3ce Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Wed, 11 Jan 2023 18:09:21 +0100
Subject: Rename Flags struct to flags

---
 src/configure.cc        | 2 +-
 src/ctor.h              | 8 ++++----
 src/externals_manual.cc | 2 +-
 src/externals_manual.h  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/configure.cc b/src/configure.cc
index 28049ae..42d9951 100644
--- a/src/configure.cc
+++ b/src/configure.cc
@@ -469,7 +469,7 @@ int regenerateCache(Settings& settings,
 		for(const auto& ext : externalConfigs)
 		{
 			istr << "			{ \"" << ext.name << "\", {\n";
-			Flags resolved_flags;
+			ctor::flags resolved_flags;
 			if(std::holds_alternative<ExternalManual>(ext.external))
 			{
 				if(auto ret = resolv(settings, ext,
diff --git a/src/ctor.h b/src/ctor.h
index 549efb4..30a563c 100644
--- a/src/ctor.h
+++ b/src/ctor.h
@@ -58,7 +58,7 @@ struct source
 	std::string output{};
 };
 
-struct Flags
+struct flags
 {
 	std::vector<std::string> cxxflags; // flags for c++ compiler
 	std::vector<std::string> cflags; // flags for c compiler
@@ -87,7 +87,7 @@ struct BuildConfiguration
 	std::string target; // Output target file for this configuration
 	std::vector<ctor::source> sources; // source list
 	std::vector<std::string> depends; // internal target dependencies
-	Flags flags;
+	ctor::flags flags;
 	std::vector<std::string> externals; // externals used by this configuration
 	GeneratorCb function;
 };
@@ -100,7 +100,7 @@ int reg(BuildConfigurations (*cb)(const Settings&),
 // This type will use flags verbatim
 struct ExternalManual
 {
-	Flags flags;
+	ctor::flags flags;
 };
 
 
@@ -147,7 +147,7 @@ struct Configuration
 	std::map<std::string, std::string> env; // env used when last calling configure
 
 	std::map<std::string, std::string> tools; // tools
-	std::map<std::string, Flags> externals;
+	std::map<std::string, ctor::flags> externals;
 };
 
 const Configuration& configuration();
diff --git a/src/externals_manual.cc b/src/externals_manual.cc
index 4c1c540..4ba4743 100644
--- a/src/externals_manual.cc
+++ b/src/externals_manual.cc
@@ -16,7 +16,7 @@ extern std::map<std::string, std::string> external_includedir;
 extern std::map<std::string, std::string> external_libdir;
 
 int resolv(const Settings& settings, const ExternalConfiguration& config,
-           const ExternalManual& ext, Flags& flags)
+           const ExternalManual& ext, ctor::flags& flags)
 {
 	auto tool_chain = getToolChain(config.system);
 
diff --git a/src/externals_manual.h b/src/externals_manual.h
index 422f279..fb165b9 100644
--- a/src/externals_manual.h
+++ b/src/externals_manual.h
@@ -7,9 +7,9 @@ namespace ctor {
 struct Settings;
 struct ExternalConfiguration;
 struct ExternalManual;
-struct Flags;
+struct flags;
 } // namespace ctor::
 
 int resolv(const ctor::Settings& settings,
            const ctor::ExternalConfiguration& name,
-           const ctor::ExternalManual& ext, ctor::Flags& flags);
+           const ctor::ExternalManual& ext, ctor::flags& flags);
-- 
cgit v1.2.3