diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-27 11:24:26 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-27 11:25:11 (GMT) |
| commit | 068effa4d8ad2813499a6e79b056d79a2120e1ad (patch) | |
| tree | 008fcbf88c2f6813542e83fb37a95e45c807b2d4 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | bb371753cb1d35c68060298ae5be6697144c9403 (diff) | |
| parent | f0489856e30b1b5236d1897071ea38dfde438fc7 (diff) | |
| download | CMake-068effa4d8ad2813499a6e79b056d79a2120e1ad.zip CMake-068effa4d8ad2813499a6e79b056d79a2120e1ad.tar.gz CMake-068effa4d8ad2813499a6e79b056d79a2120e1ad.tar.bz2 | |
Merge topic 'auto_ptr'
f0489856 Retire std::auto_ptr and its macro CM_AUTO_PTR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Merge-request: !1300
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index afd71c8..8027191 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1453,7 +1453,7 @@ cmLocalVisualStudio7GeneratorFCInfo::cmLocalVisualStudio7GeneratorFCInfo( } if (const char* cflags = sf.GetProperty("COMPILE_FLAGS")) { cmGeneratorExpression ge; - CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = ge.Parse(cflags); + std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(cflags); fc.CompileFlags = cge->Evaluate(lg, *i); needfc = true; } @@ -1849,7 +1849,7 @@ void cmLocalVisualStudio7Generator::OutputTargetRules( if (!addedPrelink) { event.Write(target->GetPreLinkCommands()); } - CM_AUTO_PTR<cmCustomCommand> pcc( + std::unique_ptr<cmCustomCommand> pcc( this->MaybeCreateImplibDir(target, configName, this->FortranProject)); if (pcc.get()) { event.Write(*pcc); |