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/cmOutputConverter.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/cmOutputConverter.cxx')
| -rw-r--r-- | Source/cmOutputConverter.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx index b92c074..411184c 100644 --- a/Source/cmOutputConverter.cxx +++ b/Source/cmOutputConverter.cxx @@ -54,7 +54,7 @@ std::string cmOutputConverter::ConvertToOutputForExisting( assert(remote != NONE); const char* remotePath = this->GetRelativeRootPath(remote); - assert(remotePath != 0); + assert(remotePath != CM_NULLPTR); return this->ConvertToOutputForExisting(remotePath, format); } @@ -73,7 +73,7 @@ const char* cmOutputConverter::GetRelativeRootPath(RelativeRoot relroot) const default: break; } - return 0; + return CM_NULLPTR; } std::string cmOutputConverter::Convert(const std::string& source, @@ -155,7 +155,7 @@ std::string cmOutputConverter::Convert(RelativeRoot remote, assert(remote != NONE); const char* remotePath = this->GetRelativeRootPath(remote); - assert(remotePath != 0); + assert(remotePath != CM_NULLPTR); if (local.empty()) { return this->ConvertToOutputFormat(remotePath, output); |