diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-22 23:42:36 +0200 |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-24 23:39:47 +0200 |
| commit | 5962db438939ef2754509b8578af1f845ec07dc8 (patch) | |
| tree | f6b0c0db2acc8dc889d2d5d46fdf75659daa17e7 /Source/cmTargetPropertyComputer.h | |
| parent | fe19fda2aa2595622c463fccaa8b36a91e4521c4 (diff) | |
| download | cmake-5962db438939ef2754509b8578af1f845ec07dc8.tar.gz | |
Use C++11 nullptr
Diffstat (limited to 'Source/cmTargetPropertyComputer.h')
| -rw-r--r-- | Source/cmTargetPropertyComputer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmTargetPropertyComputer.h b/Source/cmTargetPropertyComputer.h index 94688e3133..97e4fba2c1 100644 --- a/Source/cmTargetPropertyComputer.h +++ b/Source/cmTargetPropertyComputer.h @@ -26,12 +26,12 @@ public: return loc; } if (cmSystemTools::GetFatalErrorOccured()) { - return CM_NULLPTR; + return nullptr; } if (prop == "SOURCES") { return GetSources(tgt, messenger, context); } - return CM_NULLPTR; + return nullptr; } static bool WhiteListedInterfaceProperty(const std::string& prop); @@ -69,7 +69,7 @@ private: if (!tgt->IsImported() && !HandleLocationPropertyPolicy(tgt->GetName(), messenger, context)) { - return CM_NULLPTR; + return nullptr; } return ComputeLocationForBuild(tgt); } @@ -79,7 +79,7 @@ private: if (!tgt->IsImported() && !HandleLocationPropertyPolicy(tgt->GetName(), messenger, context)) { - return CM_NULLPTR; + return nullptr; } const char* configName = prop.c_str() + 9; return ComputeLocation(tgt, configName); @@ -93,13 +93,13 @@ private: if (!tgt->IsImported() && !HandleLocationPropertyPolicy(tgt->GetName(), messenger, context)) { - return CM_NULLPTR; + return nullptr; } return ComputeLocation(tgt, configName); } } } - return CM_NULLPTR; + return nullptr; } template <typename Target> |