summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cmCPackGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2012-11-20 23:56:36 (GMT)
committerStephen Kelly <steveire@gmail.com>2012-11-20 23:56:36 (GMT)
commitddc052052b05d6daea0791efd2e1b97a9349a5e9 (patch)
treee4452d05e36f1083cd2a804334011dacd9af50ca /Source/CPack/cmCPackGenerator.cxx
parent8faf4e93801a025d4cb17d2ef12437e5554798b1 (diff)
downloadCMake-ddc052052b05d6daea0791efd2e1b97a9349a5e9.zip
CMake-ddc052052b05d6daea0791efd2e1b97a9349a5e9.tar.gz
CMake-ddc052052b05d6daea0791efd2e1b97a9349a5e9.tar.bz2
Always use the auto_ptr from cmsys.
This is for consistency throughout cmake. The cmsys version exists becaues uses of auto_ptr types as return types does not work with some implementations in ancient compilers.
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
-rw-r--r--Source/CPack/cmCPackGenerator.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 6317fa0..7cc1522 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -23,7 +23,6 @@
#include <cmsys/SystemTools.hxx>
#include <cmsys/Glob.hxx>
-#include <memory> // auto_ptr
#include <algorithm>
#if defined(__HAIKU__)
@@ -696,7 +695,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
cm.SetProgressCallback(cmCPackGeneratorProgress, this);
cmGlobalGenerator gg;
gg.SetCMakeInstance(&cm);
- std::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
+ cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
cmMakefile *mf = lg->GetMakefile();
std::string realInstallDirectory = tempInstallDirectory;
if ( !installSubDirectory.empty() && installSubDirectory != "/" )