diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-09-01 20:31:49 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-09-07 16:03:14 (GMT) |
| commit | c330d641af1f17fae5d58783cf46db76238ae000 (patch) | |
| tree | 237516fa840e8206f6a51627f23a771f5abb9500 /Source/cmQtAutoGenerators.cxx | |
| parent | 9468e926b0fb01b2f11b9d4c9c13f7ad64b328e2 (diff) | |
| download | CMake-c330d641af1f17fae5d58783cf46db76238ae000.zip CMake-c330d641af1f17fae5d58783cf46db76238ae000.tar.gz CMake-c330d641af1f17fae5d58783cf46db76238ae000.tar.bz2 | |
Autogen: Replace CM_AUTO_PTR with std::unique_ptr
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 221a1ac..5ede9d5 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -21,7 +21,6 @@ #include "cmStateDirectory.h" #include "cmStateSnapshot.h" #include "cmSystemTools.h" -#include "cm_auto_ptr.hxx" #include "cmake.h" #if defined(__APPLE__) @@ -148,15 +147,15 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, snapshot.GetDirectory().SetCurrentBinary(targetDirectory); snapshot.GetDirectory().SetCurrentSource(targetDirectory); - CM_AUTO_PTR<cmMakefile> mf(new cmMakefile(&gg, snapshot)); - gg.SetCurrentMakefile(mf.get()); + std::unique_ptr<cmMakefile> makefile(new cmMakefile(&gg, snapshot)); + gg.SetCurrentMakefile(makefile.get()); bool success = false; - if (this->ReadAutogenInfoFile(mf.get(), targetDirectory, config)) { + if (this->ReadAutogenInfoFile(makefile.get(), targetDirectory, config)) { // Read old settings - this->SettingsFileRead(mf.get()); + this->SettingsFileRead(makefile.get()); // Init and run - this->Init(mf.get()); + this->Init(makefile.get()); if (this->RunAutogen()) { // Write current settings if (this->SettingsFileWrite()) { |