mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-23 23:49:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmInstalledFile: modernize memory management

Browse Source
This commit is contained in:
Marc Chevrier
2019-12-18 17:50:42 +01:00
parent 3c632b89ab
commit 23130c539f
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmInstalledFile.cxx
View File

@@ -4,7 +4,6 @@
#include <utility>
#include "cmAlgorithms.h"
#include "cmGeneratorExpression.h"
#include "cmListFileCache.h"
#include "cmMakefile.h"
@@ -12,17 +11,11 @@
cmInstalledFile::cmInstalledFile() = default;
cmInstalledFile::~cmInstalledFile()
{
delete NameExpression;
}
cmInstalledFile::~cmInstalledFile() = default;
cmInstalledFile::Property::Property() = default;
cmInstalledFile::Property::~Property()
{
cmDeleteAll(this->ValueExpressions);
}
cmInstalledFile::Property::~Property() = default;
void cmInstalledFile::SetName(cmMakefile* mf, const std::string& name)
{
@@ -30,7 +23,7 @@ void cmInstalledFile::SetName(cmMakefile* mf, const std::string& name)
cmGeneratorExpression ge(backtrace);
this->Name = name;
this->NameExpression = ge.Parse(name).release();
this->NameExpression = ge.Parse(name);
}
std::string const& cmInstalledFile::GetName() const
@@ -63,7 +56,7 @@ void cmInstalledFile::AppendProperty(cmMakefile const* mf,
cmGeneratorExpression ge(backtrace);
Property& property = this->Properties[prop];
property.ValueExpressions.push_back(ge.Parse(value).release());
property.ValueExpressions.push_back(ge.Parse(value));
}
bool cmInstalledFile::HasProperty(const std::string& prop) const
@@ -84,7 +77,7 @@ bool cmInstalledFile::GetProperty(const std::string& prop,
std::string output;
std::string separator;
for (auto ve : property.ValueExpressions) {
for (const auto& ve : property.ValueExpressions) {
output += separator;
output += ve->GetInput();
separator = ";";

4
Source/cmInstalledFile.h
View File

@@ -24,7 +24,7 @@ public:
using CompiledGeneratorExpressionPtrType =
std::unique_ptr<cmCompiledGeneratorExpression>;
using ExpressionVectorType = std::vector<cmCompiledGeneratorExpression*>;
using ExpressionVectorType = std::vector<CompiledGeneratorExpressionPtrType>;
struct Property
{
@@ -73,7 +73,7 @@ public:
private:
std::string Name;
cmCompiledGeneratorExpression* NameExpression = nullptr;
CompiledGeneratorExpressionPtrType NameExpression;
PropertyMapType Properties;
};