diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-28 14:17:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-29 13:47:58 (GMT) |
| commit | b5ec5b0901177ebcd116d6ddd66ed114549014ec (patch) | |
| tree | e1f24c8e619966137f4f8e09d4590b72c6a3c078 /Source/cmGeneratorExpression.h | |
| parent | 8d79375818efbaa06858a8e2d176ab8a251bef63 (diff) | |
| download | CMake-b5ec5b0901177ebcd116d6ddd66ed114549014ec.zip CMake-b5ec5b0901177ebcd116d6ddd66ed114549014ec.tar.gz CMake-b5ec5b0901177ebcd116d6ddd66ed114549014ec.tar.bz2 | |
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|'
Diffstat (limited to 'Source/cmGeneratorExpression.h')
| -rw-r--r-- | Source/cmGeneratorExpression.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h index 5d02427..2f91608 100644 --- a/Source/cmGeneratorExpression.h +++ b/Source/cmGeneratorExpression.h @@ -17,8 +17,8 @@ #include "cmListFileCache.h" +#include <cm_auto_ptr.hxx> #include <cmsys/RegularExpression.hxx> -#include <cmsys/auto_ptr.hxx> class cmGeneratorTarget; class cmLocalGenerator; @@ -47,9 +47,8 @@ public: cmListFileBacktrace const& backtrace = cmListFileBacktrace()); ~cmGeneratorExpression(); - cmsys::auto_ptr<cmCompiledGeneratorExpression> Parse( - std::string const& input); - cmsys::auto_ptr<cmCompiledGeneratorExpression> Parse(const char* input); + CM_AUTO_PTR<cmCompiledGeneratorExpression> Parse(std::string const& input); + CM_AUTO_PTR<cmCompiledGeneratorExpression> Parse(const char* input); enum PreprocessContext { |