Commit dba8086f authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'refactor/use-unique_ptr'

5e52de7d modermize: replace some raw pointers w/ `unique_ptr`
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !3465
parents 92351fe7 5e52de7d
......@@ -202,7 +202,6 @@ cmComputeLinkDepends::cmComputeLinkDepends(const cmGeneratorTarget* target,
cmComputeLinkDepends::~cmComputeLinkDepends()
{
cmDeleteAll(this->InferredDependSets);
delete this->CCG;
}
void cmComputeLinkDepends::SetOldLinkDirMode(bool b)
......@@ -632,7 +631,8 @@ void cmComputeLinkDepends::OrderLinkEntires()
// the same order in which the items were originally discovered in
// the BFS. This should preserve the original order when no
// constraints disallow it.
this->CCG = new cmComputeComponentGraph(this->EntryConstraintGraph);
this->CCG =
cm::make_unique<cmComputeComponentGraph>(this->EntryConstraintGraph);
// The component graph is guaranteed to be acyclic. Start a DFS
// from every entry to compute a topological order for the
......
......@@ -137,7 +137,7 @@ private:
std::set<int> Entries;
};
std::map<int, PendingComponent> PendingComponents;
cmComputeComponentGraph* CCG;
std::unique_ptr<cmComputeComponentGraph> CCG;
std::vector<int> FinalLinkOrder;
void DisplayComponents();
void VisitComponent(unsigned int c);
......
......@@ -92,7 +92,6 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
// how long to let try compiles run
this->TryCompileTimeout = cmDuration::zero();
this->ExtraGenerator = nullptr;
this->CurrentConfigureMakefile = nullptr;
this->TryCompileOuterMakefile = nullptr;
......@@ -113,7 +112,6 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
cmGlobalGenerator::~cmGlobalGenerator()
{
this->ClearGeneratorMembers();
delete this->ExtraGenerator;
}
#if defined(CMAKE_BUILD_WITH_CMAKE)
......@@ -1499,7 +1497,7 @@ void cmGlobalGenerator::Generate()
this->WriteSummary();
if (this->ExtraGenerator != nullptr) {
if (this->ExtraGenerator) {
this->ExtraGenerator->Generate();
}
......@@ -2720,8 +2718,8 @@ bool cmGlobalGenerator::IsReservedTarget(std::string const& name)
void cmGlobalGenerator::SetExternalMakefileProjectGenerator(
cmExternalMakefileProjectGenerator* extraGenerator)
{
this->ExtraGenerator = extraGenerator;
if (this->ExtraGenerator != nullptr) {
this->ExtraGenerator.reset(extraGenerator);
if (this->ExtraGenerator) {
this->ExtraGenerator->SetGlobalGenerator(this);
}
}
......
......@@ -618,7 +618,7 @@ private:
void ComputeBuildFileGenerators();
cmExternalMakefileProjectGenerator* ExtraGenerator;
std::unique_ptr<cmExternalMakefileProjectGenerator> ExtraGenerator;
// track files replaced during a Generate
std::vector<std::string> FilesReplacedDuringGenerate;
......
......@@ -2,9 +2,9 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmMachO.h"
#include "cmAlgorithms.h"
#include "cmsys/FStream.hxx"
#include <algorithm>
#include <stddef.h>
#include <cstddef>
#include <string>
#include <vector>
......@@ -120,7 +120,7 @@ protected:
// Implementation for reading Mach-O header and load commands.
// This is 32 or 64 bit arch specific.
template <class T>
template <typename T>
class cmMachOHeaderAndLoadCommandsImpl : public cmMachOHeaderAndLoadCommands
{
public:
......@@ -306,15 +306,11 @@ bool cmMachOInternal::read_mach_o(uint32_t file_offset)
// External class implementation.
cmMachO::cmMachO(const char* fname)
: Internal(nullptr)
: Internal(cm::make_unique<cmMachOInternal>(fname))
{
this->Internal = new cmMachOInternal(fname);
}
cmMachO::~cmMachO()
{
delete this->Internal;
}
cmMachO::~cmMachO() = default;
std::string const& cmMachO::GetErrorMessage() const
{
......
......@@ -41,7 +41,7 @@ public:
private:
friend class cmMachOInternal;
bool Valid() const;
cmMachOInternal* Internal;
std::unique_ptr<cmMachOInternal> Internal;
};
#endif
......@@ -23,14 +23,12 @@
cmState::cmState()
{
this->CacheManager = new cmCacheManager;
this->GlobVerificationManager = new cmGlobVerificationManager;
this->CacheManager = cm::make_unique<cmCacheManager>();
this->GlobVerificationManager = cm::make_unique<cmGlobVerificationManager>();
}
cmState::~cmState()
{
delete this->CacheManager;
delete this->GlobVerificationManager;
cmDeleteAll(this->BuiltinCommands);
cmDeleteAll(this->ScriptedCommands);
}
......
......@@ -211,8 +211,8 @@ private:
std::map<std::string, cmCommand*> BuiltinCommands;
std::map<std::string, cmCommand*> ScriptedCommands;
cmPropertyMap GlobalProperties;
cmCacheManager* CacheManager;
cmGlobVerificationManager* GlobVerificationManager;
std::unique_ptr<cmCacheManager> CacheManager;
std::unique_ptr<cmGlobVerificationManager> GlobVerificationManager;
cmLinkedTree<cmStateDetail::BuildsystemDirectoryStateType>
BuildsystemDirectory;
......
......@@ -141,12 +141,12 @@ cmake::cmake(Role role, cmState::Mode mode)
this->DebugOutput = false;
this->DebugTryCompile = false;
this->ClearBuildSystem = false;
this->FileTimeCache = new cmFileTimeCache;
this->FileTimeCache = cm::make_unique<cmFileTimeCache>();
this->State = new cmState;
this->State = cm::make_unique<cmState>();
this->State->SetMode(mode);
this->CurrentSnapshot = this->State->CreateBaseSnapshot();
this->Messenger = new cmMessenger;
this->Messenger = cm::make_unique<cmMessenger>();
#ifdef __APPLE__
struct rlimit rlp;
......@@ -165,7 +165,7 @@ cmake::cmake(Role role, cmState::Mode mode)
this->CurrentWorkingMode = NORMAL_MODE;
#ifdef CMAKE_BUILD_WITH_CMAKE
this->VariableWatch = new cmVariableWatch;
this->VariableWatch = cm::make_unique<cmVariableWatch>();
#endif
this->AddDefaultGenerators();
......@@ -222,17 +222,11 @@ cmake::cmake(Role role, cmState::Mode mode)
cmake::~cmake()
{
delete this->State;
delete this->Messenger;
if (this->GlobalGenerator) {
delete this->GlobalGenerator;
this->GlobalGenerator = nullptr;
}
cmDeleteAll(this->Generators);
#ifdef CMAKE_BUILD_WITH_CMAKE
delete this->VariableWatch;
#endif
delete this->FileTimeCache;
}
#if defined(CMAKE_BUILD_WITH_CMAKE)
......@@ -460,7 +454,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
return false;
}
// Register fake project commands that hint misuse in script mode.
GetProjectCommandsInScriptMode(this->State);
GetProjectCommandsInScriptMode(this->GetState());
this->ReadListFile(args, path);
} else if (arg.find("--find-package", 0) == 0) {
findPackageMode = true;
......@@ -1898,12 +1892,12 @@ const char* cmake::GetCacheDefinition(const std::string& name) const
void cmake::AddScriptingCommands()
{
GetScriptingCommands(this->State);
GetScriptingCommands(this->GetState());
}
void cmake::AddProjectCommands()
{
GetProjectCommands(this->State);
GetProjectCommands(this->GetState());
}
void cmake::AddDefaultGenerators()
......@@ -2607,11 +2601,6 @@ std::vector<std::string> cmake::GetDebugConfigs()
return configs;
}
cmMessenger* cmake::GetMessenger() const
{
return this->Messenger;
}
int cmake::Build(int jobs, const std::string& dir,
const std::vector<std::string>& targets,
const std::string& config,
......
......@@ -307,7 +307,7 @@ public:
#if defined(CMAKE_BUILD_WITH_CMAKE)
//! Get the variable watch object
cmVariableWatch* GetVariableWatch() { return this->VariableWatch; }
cmVariableWatch* GetVariableWatch() { return this->VariableWatch.get(); }
#endif
std::vector<cmDocumentationEntry> GetGeneratorsDocumentation();
......@@ -348,18 +348,18 @@ public:
/**
* Get the file comparison class
*/
cmFileTimeCache* GetFileTimeCache() { return this->FileTimeCache; }
cmFileTimeCache* GetFileTimeCache() { return this->FileTimeCache.get(); }
// Get the selected log level for `message()` commands during the cmake run.
//! Get the selected log level for `message()` commands during the cmake run.
LogLevel GetLogLevel() const { return this->MessageLogLevel; }
void SetLogLevel(LogLevel level) { this->MessageLogLevel = level; }
static LogLevel StringToLogLevel(const std::string& levelStr);
// Do we want debug output during the cmake run.
//! Do we want debug output during the cmake run.
bool GetDebugOutput() { return this->DebugOutput; }
void SetDebugOutputOn(bool b) { this->DebugOutput = b; }
// Do we want trace output during the cmake run.
//! Do we want trace output during the cmake run.
bool GetTrace() { return this->Trace; }
void SetTrace(bool b) { this->Trace = b; }
bool GetTraceExpand() { return this->TraceExpand; }
......@@ -396,31 +396,31 @@ public:
return this->CMakeEditCommand;
}
cmMessenger* GetMessenger() const;
cmMessenger* GetMessenger() const { return this->Messenger.get(); }
/*
/**
* Get the state of the suppression of developer (author) warnings.
* Returns false, by default, if developer warnings should be shown, true
* otherwise.
*/
bool GetSuppressDevWarnings() const;
/*
/**
* Set the state of the suppression of developer (author) warnings.
*/
void SetSuppressDevWarnings(bool v);
/*
/**
* Get the state of the suppression of deprecated warnings.
* Returns false, by default, if deprecated warnings should be shown, true
* otherwise.
*/
bool GetSuppressDeprecatedWarnings() const;
/*
/**
* Set the state of the suppression of deprecated warnings.
*/
void SetSuppressDeprecatedWarnings(bool v);
/*
/**
* Get the state of treating developer (author) warnings as errors.
* Returns false, by default, if warnings should not be treated as errors,
* true otherwise.
......@@ -431,7 +431,7 @@ public:
*/
void SetDevWarningsAsErrors(bool v);
/*
/**
* Get the state of treating deprecated warnings as errors.
* Returns false, by default, if warnings should not be treated as errors,
* true otherwise.
......@@ -459,7 +459,7 @@ public:
void UnwatchUnusedCli(const std::string& var);
void WatchUnusedCli(const std::string& var);
cmState* GetState() const { return this->State; }
cmState* GetState() const { return this->State.get(); }
void SetCurrentSnapshot(cmStateSnapshot const& snapshot)
{
this->CurrentSnapshot = snapshot;
......@@ -537,18 +537,18 @@ private:
std::unordered_set<std::string> HeaderFileExtensionsSet;
bool ClearBuildSystem;
bool DebugTryCompile;
cmFileTimeCache* FileTimeCache;
std::unique_ptr<cmFileTimeCache> FileTimeCache;
std::string GraphVizFile;
InstalledFilesMap InstalledFiles;
#if defined(CMAKE_BUILD_WITH_CMAKE)
cmVariableWatch* VariableWatch;
std::unique_ptr<cmVariableWatch> VariableWatch;
std::unique_ptr<cmFileAPI> FileAPI;
#endif
cmState* State;
std::unique_ptr<cmState> State;
cmStateSnapshot CurrentSnapshot;
cmMessenger* Messenger;
std::unique_ptr<cmMessenger> Messenger;
std::vector<std::string> TraceOnlyThisSources;
......@@ -556,7 +556,7 @@ private:
void UpdateConversionPathTable();
// Print a list of valid generators to stderr.
//! Print a list of valid generators to stderr.
void PrintGeneratorList();
std::unique_ptr<cmGlobalGenerator> EvaluateDefaultGlobalGenerator();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment