summaryrefslogtreecommitdiff
path: root/src/rebuild.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/rebuild.cc')
-rw-r--r--src/rebuild.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rebuild.cc b/src/rebuild.cc
index daf5443..a1903fe 100644
--- a/src/rebuild.cc
+++ b/src/rebuild.cc
@@ -23,7 +23,7 @@ std::array<BuildConfigurationEntry, 1024> configFiles;
std::size_t numConfigFiles{0};
namespace ctor {
-int reg(BuildConfigurations (*cb)(const Settings&),
+int reg(BuildConfigurations (*cb)(const ctor::settings&),
const std::source_location location)
{
// NOTE: std::cout cannot be used here
@@ -64,7 +64,7 @@ int reg(const char* location)
configFiles[numConfigFiles].file = location;
configFiles[numConfigFiles].cb =
- [](const Settings&){ return std::vector<BuildConfiguration>{}; };
+ [](const ctor::settings&){ return std::vector<BuildConfiguration>{}; };
++numConfigFiles;
return 0;
@@ -114,7 +114,7 @@ std::array<ExternalConfigurationEntry, 1024> externalConfigFiles;
std::size_t numExternalConfigFiles{0};
namespace ctor {
-int reg(ExternalConfigurations (*cb)(const Settings&),
+int reg(ExternalConfigurations (*cb)(const ctor::settings&),
const std::source_location location)
{
// NOTE: std::cout cannot be used here
@@ -149,7 +149,7 @@ bool contains(const std::vector<ctor::source>& sources, const std::string& file)
}
}
-bool recompileCheck(const Settings& global_settings, int argc, char* argv[],
+bool recompileCheck(const ctor::settings& global_settings, int argc, char* argv[],
bool relaunch_allowed)
{
using namespace std::string_literals;
@@ -185,7 +185,7 @@ bool recompileCheck(const Settings& global_settings, int argc, char* argv[],
append(config.flags.ldflags, getOption(tool_chain, opt::link, "ctor"));
append(config.flags.ldflags, getOption(tool_chain, opt::threads));
- Settings settings{global_settings};
+ ctor::settings settings{global_settings};
settings.verbose = -1; // Make check completely silent.
settings.builddir += "/ctor"; // override builddir to use ctor subdir