diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-30 13:47:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-30 13:47:38 (GMT) |
| commit | 2bef3774276e0b27718107edccd5e107fd72b292 (patch) | |
| tree | d6775f73193773b1395674f95c47c3952468734f /Source/CTest/cmCTestLaunch.cxx | |
| parent | 21afc0291e9aa9ace69da008e267dfc3c278eca0 (diff) | |
| parent | b5ec5b0901177ebcd116d6ddd66ed114549014ec (diff) | |
| download | CMake-2bef3774276e0b27718107edccd5e107fd72b292.zip CMake-2bef3774276e0b27718107edccd5e107fd72b292.tar.gz CMake-2bef3774276e0b27718107edccd5e107fd72b292.tar.bz2 | |
Merge topic 'refactor-auto_ptr'
b5ec5b09 Avoid using KWSys auto_ptr by adopting it ourselves
Diffstat (limited to 'Source/CTest/cmCTestLaunch.cxx')
| -rw-r--r-- | Source/CTest/cmCTestLaunch.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 477f16e..3eed79e 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -612,7 +612,7 @@ int cmCTestLaunch::Main(int argc, const char* const argv[]) #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmake.h" -#include <cmsys/auto_ptr.hxx> +#include <cm_auto_ptr.hxx> void cmCTestLaunch::LoadConfig() { cmake cm; @@ -620,7 +620,7 @@ void cmCTestLaunch::LoadConfig() cm.SetHomeOutputDirectory(""); cm.GetCurrentSnapshot().SetDefaultDefinitions(); cmGlobalGenerator gg(&cm); - cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot())); + CM_AUTO_PTR<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot())); std::string fname = this->LogDir; fname += "CTestLaunchConfig.cmake"; if (cmSystemTools::FileExists(fname.c_str()) && |