From 560bcdbb972cbf4c7ea77010363c652b697b9933 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 20 Jul 2016 10:15:56 -0400
Subject: [PATCH] SystemTools: Factor out common `const char* GetEnv()` private
implementation
Remove the last calls to the GetEnv methods with this signature from
KWSys itself.
Change-Id: I9cdb2b060776a00bb698b396c9b33450237cd0b7
---
SystemTools.cxx | 9 +++++++--
SystemTools.hxx.in | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 0526372..9b56db0 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -523,7 +523,7 @@ void SystemTools::GetPath(std::vector<std::string>& path, const char* env)
}
}
-const char* SystemTools::GetEnv(const char* key)
+const char* SystemTools::GetEnvImpl(const char* key)
{
const char *v = 0;
#if defined(_WIN32)
@@ -540,9 +540,14 @@ const char* SystemTools::GetEnv(const char* key)
return v;
}
+const char* SystemTools::GetEnv(const char* key)
+{
+ return SystemTools::GetEnvImpl(key);
+}
+
const char* SystemTools::GetEnv(const std::string& key)
{
- return SystemTools::GetEnv(key.c_str());
+ return SystemTools::GetEnvImpl(key.c_str());
}
bool SystemTools::GetEnv(const char* key, std::string& result)
diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in
index 8f01e75..aa1bf1b 100644
--- a/SystemTools.hxx.in
+++ b/SystemTools.hxx.in
@@ -984,6 +984,7 @@ private:
std::vector<std::string>(),
bool no_system_path = false);
+ static const char* GetEnvImpl(const char* key);
/**
* Path translation table from dir to refdir
--
GitLab