diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-25 15:25:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-25 15:26:24 (GMT) |
| commit | ebe436eb97bf81704a1d0b074b3da4ac817f37d3 (patch) | |
| tree | ae29917c18a9ef90b62da4f616fbf2e8e702fb68 /Source/cmPolicies.cxx | |
| parent | 53305ce5b067c4feaa91ffe0cc82b740af525b3f (diff) | |
| parent | 5962db438939ef2754509b8578af1f845ec07dc8 (diff) | |
| download | CMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.zip CMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.tar.gz CMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.tar.bz2 | |
Merge topic 'cxx11-nullptr'
5962db43 Use C++11 nullptr
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1175
Diffstat (limited to 'Source/cmPolicies.cxx')
| -rw-r--r-- | Source/cmPolicies.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index da3edd4..76b8ba1 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -62,9 +62,9 @@ static const char* idToString(cmPolicies::PolicyID id) CM_FOR_EACH_POLICY_ID(POLICY_CASE) #undef POLICY_CASE case cmPolicies::CMPCOUNT: - return CM_NULLPTR; + return nullptr; } - return CM_NULLPTR; + return nullptr; } static const char* idToVersion(cmPolicies::PolicyID id) @@ -76,9 +76,9 @@ static const char* idToVersion(cmPolicies::PolicyID id) CM_FOR_EACH_POLICY_ID_VERSION(POLICY_CASE) #undef POLICY_CASE case cmPolicies::CMPCOUNT: - return CM_NULLPTR; + return nullptr; } - return CM_NULLPTR; + return nullptr; } static bool isPolicyNewerThan(cmPolicies::PolicyID id, unsigned int majorV, @@ -108,9 +108,9 @@ const char* idToShortDescription(cmPolicies::PolicyID id) CM_FOR_EACH_POLICY_ID_DOC(POLICY_CASE) #undef POLICY_CASE case cmPolicies::CMPCOUNT: - return CM_NULLPTR; + return nullptr; } - return CM_NULLPTR; + return nullptr; } static void DiagnoseAncientPolicies( |