From 430801b1307b4c820885f161d0b003011c892d77 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 11 Jan 2023 20:08:10 +0100 Subject: Add ctor namespace cfg:: constants and get rid of temporary 'using namespace ctor' --- src/rebuild.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/rebuild.cc') diff --git a/src/rebuild.cc b/src/rebuild.cc index 3033a46..0d610b5 100644 --- a/src/rebuild.cc +++ b/src/rebuild.cc @@ -17,8 +17,6 @@ #include "tools.h" #include "util.h" -using namespace ctor; - std::array configFiles; std::size_t numConfigFiles{0}; @@ -50,7 +48,7 @@ int reg(ctor::build_configurations (*cb)(const ctor::settings&), return 0; } -} // namespace ctor:: +} // ctor:: int reg(const char* location) { @@ -171,17 +169,17 @@ bool recompileCheck(const ctor::settings& global_settings, int argc, char* argv[ append(config.flags.cxxflags, getOption(tool_chain, opt::cpp_std, "c++20")); const auto& c = ctor::get_configuration(); - if(c.has(cfg::ctor_includedir)) + if(c.has(ctor::cfg::ctor_includedir)) { append(config.flags.cxxflags, getOption(tool_chain, opt::include_path, - c.get(cfg::ctor_includedir))); + c.get(ctor::cfg::ctor_includedir))); } - if(c.has(cfg::ctor_libdir)) + if(c.has(ctor::cfg::ctor_libdir)) { append(config.flags.ldflags, getOption(tool_chain, opt::library_path, - c.get(cfg::ctor_libdir))); + c.get(ctor::cfg::ctor_libdir))); } append(config.flags.ldflags, getOption(tool_chain, opt::link, "ctor")); append(config.flags.ldflags, getOption(tool_chain, opt::threads)); -- cgit v1.2.3