mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Replace CM_AUTO_PTR with std::unique_ptr

Browse Source
This commit is contained in:
Sebastian Holtermann
2017-09-01 22:31:49 +02:00
parent 9468e926b0
commit c330d641af
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmQtAutoGenerators.cxx
View File

@@ -21,7 +21,6 @@
#include "cmStateDirectory.h" #include "cmStateDirectory.h"
#include "cmStateSnapshot.h" #include "cmStateSnapshot.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cm_auto_ptr.hxx"
#include "cmake.h" #include "cmake.h"
#if defined(__APPLE__) #if defined(__APPLE__)
@@ -148,15 +147,15 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
snapshot.GetDirectory().SetCurrentBinary(targetDirectory); snapshot.GetDirectory().SetCurrentBinary(targetDirectory);
snapshot.GetDirectory().SetCurrentSource(targetDirectory); snapshot.GetDirectory().SetCurrentSource(targetDirectory);
CM_AUTO_PTR<cmMakefile> mf(new cmMakefile(&gg, snapshot)); std::unique_ptr<cmMakefile> makefile(new cmMakefile(&gg, snapshot));
gg.SetCurrentMakefile(mf.get()); gg.SetCurrentMakefile(makefile.get());
bool success = false; bool success = false;
if (this->ReadAutogenInfoFile(mf.get(), targetDirectory, config)) { if (this->ReadAutogenInfoFile(makefile.get(), targetDirectory, config)) {
// Read old settings // Read old settings
this->SettingsFileRead(mf.get()); this->SettingsFileRead(makefile.get());
// Init and run // Init and run
this->Init(mf.get()); this->Init(makefile.get());
if (this->RunAutogen()) { if (this->RunAutogen()) {
// Write current settings // Write current settings
if (this->SettingsFileWrite()) { if (this->SettingsFileWrite()) {