summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorDaniel Pfeifer <daniel@pfeifer-mail.de>2016-09-16 21:01:40 (GMT)
committerDaniel Pfeifer <daniel@pfeifer-mail.de>2016-09-16 21:01:40 (GMT)
commit782fcbb92e096a28f899c89eed6fe23f29cd997c (patch)
tree3700d9b442648c39ef1a4b0c3bdee45d5f327943 /Source
parent809ca6c81fa23cec111a9e97529d71538c55f9eb (diff)
downloadCMake-782fcbb92e096a28f899c89eed6fe23f29cd997c.zip
CMake-782fcbb92e096a28f899c89eed6fe23f29cd997c.tar.gz
CMake-782fcbb92e096a28f899c89eed6fe23f29cd997c.tar.bz2
Use CM_NULLPTR
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGetPropertyCommand.cxx2
-rw-r--r--Source/cmInstallCommand.cxx2
-rw-r--r--Source/cm_auto_ptr.hxx6
3 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 3aef9cf..8063328 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode()
if (this->Makefile->IsAlias(this->Name)) {
return this->StoreResult(target->GetName().c_str());
}
- return this->StoreResult(NULL);
+ return this->StoreResult(CM_NULLPTR);
}
return this->StoreResult(
target->GetProperty(this->PropertyName, this->Makefile));
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index f55fefb..8450360 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -1118,7 +1118,7 @@ bool cmInstallCommand::HandleExportAndroidMKMode(
cmCAEnabler exportOld(&ica.Parser, "EXPORT_LINK_INTERFACE_LIBRARIES",
&ica.ArgumentGroup);
cmCAString filename(&ica.Parser, "FILE", &ica.ArgumentGroup);
- exp.Follows(0);
+ exp.Follows(CM_NULLPTR);
ica.ArgumentGroup.Follows(&exp);
std::vector<std::string> unknownArgs;
diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx
index 2cd35c3..f6c4362 100644
--- a/Source/cm_auto_ptr.hxx
+++ b/Source/cm_auto_ptr.hxx
@@ -12,7 +12,7 @@
#ifndef CM_AUTO_PTR_HXX
#define CM_AUTO_PTR_HXX
-#include <cmsys/Configure.hxx>
+#include <cmConfigure.h>
// FIXME: Use std::auto_ptr on compilers that do not warn about it.
#define CM_AUTO_PTR cm::auto_ptr
@@ -115,7 +115,7 @@ public:
*
* auto_ptr<X> ptr(new X());
*/
- explicit auto_ptr(X* p = 0) throw()
+ explicit auto_ptr(X* p = CM_NULLPTR) throw()
: x_(p)
{
}
@@ -157,7 +157,7 @@ public:
X* release() throw()
{
X* x = this->x_;
- this->x_ = 0;
+ this->x_ = CM_NULLPTR;
return x;
}