diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2018-09-04 15:08:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-05 19:15:55 (GMT) |
| commit | 4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0 (patch) | |
| tree | d7609df1293e9d4af24cb27e5d9f024844ed6144 /Source/cmMakefile.cxx | |
| parent | 612975c6652c83c29fcfcf56a7b5a0cfe0218c93 (diff) | |
| download | CMake-4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0.zip CMake-4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0.tar.gz CMake-4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0.tar.bz2 | |
cmMakefile: Make GetRequiredDefinition return std::string
In all cases the return value is converted to std::string anyway.
Also remove unnecessary `c_str()` calls in arguments to
`GetRequiredDefinition`.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6127b57..5fd61bf 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2354,16 +2354,16 @@ bool cmMakefile::CanIWriteThisFile(std::string const& fileName) const cmSystemTools::SameFile(fileName, this->GetHomeOutputDirectory()); } -const char* cmMakefile::GetRequiredDefinition(const std::string& name) const +std::string cmMakefile::GetRequiredDefinition(const std::string& name) const { const char* ret = this->GetDefinition(name); if (!ret) { cmSystemTools::Error("Error required internal CMake variable not " "set, cmake may not be built correctly.\n", "Missing variable is:\n", name.c_str()); - return ""; + return std::string(); } - return ret; + return std::string(ret); } bool cmMakefile::IsDefinitionSet(const std::string& name) const |