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/cmGeneratorExpressionEvaluationFile.h | |
| 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/cmGeneratorExpressionEvaluationFile.h')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluationFile.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h index bfd6add..52ba2d8 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.h +++ b/Source/cmGeneratorExpressionEvaluationFile.h @@ -14,7 +14,7 @@ #include "cmGeneratorExpression.h" -#include <cmsys/auto_ptr.hxx> +#include <cm_auto_ptr.hxx> #include <sys/types.h> class cmLocalGenerator; @@ -24,9 +24,8 @@ class cmGeneratorExpressionEvaluationFile public: cmGeneratorExpressionEvaluationFile( const std::string& input, - cmsys::auto_ptr<cmCompiledGeneratorExpression> outputFileExpr, - cmsys::auto_ptr<cmCompiledGeneratorExpression> condition, - bool inputIsContent); + CM_AUTO_PTR<cmCompiledGeneratorExpression> outputFileExpr, + CM_AUTO_PTR<cmCompiledGeneratorExpression> condition, bool inputIsContent); void Generate(cmLocalGenerator* lg); @@ -42,8 +41,8 @@ private: private: const std::string Input; - const cmsys::auto_ptr<cmCompiledGeneratorExpression> OutputFileExpr; - const cmsys::auto_ptr<cmCompiledGeneratorExpression> Condition; + const CM_AUTO_PTR<cmCompiledGeneratorExpression> OutputFileExpr; + const CM_AUTO_PTR<cmCompiledGeneratorExpression> Condition; std::vector<std::string> Files; const bool InputIsContent; }; |