summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2025-01-20 21:28:25 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2025-01-22 08:12:57 +0100
commite0009216ee830e8da023047ed6fe187f48f612d1 (patch)
tree33961e665fda1e9a93c90385f7d65f01963e3398 /test
parent3438b4d3eb272c301e28af7cb72c6d2adb0e6597 (diff)
Don't return const ref strings in ctor::configuration::get. Instead return std::string by copy.
Diffstat (limited to 'test')
-rw-r--r--test/tools_test.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/test/tools_test.cc b/test/tools_test.cc
index a428ea1..46ab084 100644
--- a/test/tools_test.cc
+++ b/test/tools_test.cc
@@ -114,33 +114,27 @@ bool operator!=(const ctor::asm_flag& a, const ctor::asm_flag& b)
#include <uunit.h>
-namespace {
-std::string conf_host_cxx{};
-std::string conf_build_cxx{};
-}
-
const ctor::configuration& ctor::get_configuration()
{
static ctor::configuration cfg;
return cfg;
}
-const std::string& ctor::configuration::get(const std::string& key, const std::string& defval) const
+std::string ctor::configuration::get(const std::string& key, [[maybe_unused]]const std::string& default_value) const
{
if(key == ctor::cfg::host_cxx)
{
- return conf_host_cxx;
+ return {};
}
if(key == ctor::cfg::build_cxx)
{
- return conf_build_cxx;
+ return {};
}
assert(false); // bad key
- static std::string res{};
- return res;
+ return {};
}
class ToolsTest