From b5ec5b0901177ebcd116d6ddd66ed114549014ec Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 28 Jun 2016 10:17:52 -0400 Subject: Avoid using KWSys auto_ptr by adopting it ourselves Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to our own implementation adopted from the KWSys auto_ptr implementation. Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers that do not warn about it. Automate the client site conversions: git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \ 's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|' --- Source/cmCustomCommandGenerator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/cmCustomCommandGenerator.cxx') diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index 315a1b6d4f..6165bcf117 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -66,7 +66,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const } } - cmsys::auto_ptr cge = this->GE->Parse(argv0); + CM_AUTO_PTR cge = this->GE->Parse(argv0); std::string exe = cge->Evaluate(this->LG, this->Config); return exe; @@ -145,7 +145,7 @@ std::vector const& cmCustomCommandGenerator::GetDepends() const std::vector depends = this->CC.GetDepends(); for (std::vector::const_iterator i = depends.begin(); i != depends.end(); ++i) { - cmsys::auto_ptr cge = this->GE->Parse(*i); + CM_AUTO_PTR cge = this->GE->Parse(*i); std::vector result; cmSystemTools::ExpandListArgument(cge->Evaluate(this->LG, this->Config), result); -- cgit v1.2.1