diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-28 13:06:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-28 13:06:39 (GMT) |
| commit | f91312175822e94d66a92cb919dc04096609a7a7 (patch) | |
| tree | 625a53723ac86e71c00606e5605abe2b4c67bcc6 /Source/CPack/cmCPackGeneratorFactory.cxx | |
| parent | f23d846a971b99ec23bee1ff2afaee845a846e5f (diff) | |
| parent | 059a6ca07a6f8bb4e101e9b269d6bdb4c0281018 (diff) | |
| download | CMake-f91312175822e94d66a92cb919dc04096609a7a7.zip CMake-f91312175822e94d66a92cb919dc04096609a7a7.tar.gz CMake-f91312175822e94d66a92cb919dc04096609a7a7.tar.bz2 | |
Merge topic 'compiler-features'
059a6ca0 Merge branch 'unknown-aliased-target' into compiler-features
1d6909a2 use CM_NULLPTR
b4b73f56 cxx features: add check for nullptr
a7a92390 mark functions with CM_OVERRIDE
9e2d6f0c CM_OVERRIDE: mark destructor overridden in the feature test.
2ca76a66 Validate target name in ALIASED_TARGET property getter
Diffstat (limited to 'Source/CPack/cmCPackGeneratorFactory.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGeneratorFactory.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 2210835..0f0268f 100644 --- a/Source/CPack/cmCPackGeneratorFactory.cxx +++ b/Source/CPack/cmCPackGeneratorFactory.cxx @@ -151,7 +151,7 @@ cmCPackGenerator* cmCPackGeneratorFactory::NewGenerator( { cmCPackGenerator* gen = this->NewGeneratorInternal(name); if (!gen) { - return 0; + return CM_NULLPTR; } this->Generators.push_back(gen); gen->SetLogger(this->Logger); @@ -164,7 +164,7 @@ cmCPackGenerator* cmCPackGeneratorFactory::NewGeneratorInternal( cmCPackGeneratorFactory::t_GeneratorCreatorsMap::iterator it = this->GeneratorCreators.find(name); if (it == this->GeneratorCreators.end()) { - return 0; + return CM_NULLPTR; } return (it->second)(); } |