Commit 782fcbb9 authored by Daniel Pfeifer's avatar Daniel Pfeifer
Browse files

Use CM_NULLPTR

parent 809ca6c8
...@@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode() ...@@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode()
if (this->Makefile->IsAlias(this->Name)) { if (this->Makefile->IsAlias(this->Name)) {
return this->StoreResult(target->GetName().c_str()); return this->StoreResult(target->GetName().c_str());
} }
return this->StoreResult(NULL); return this->StoreResult(CM_NULLPTR);
} }
return this->StoreResult( return this->StoreResult(
target->GetProperty(this->PropertyName, this->Makefile)); target->GetProperty(this->PropertyName, this->Makefile));
......
...@@ -1118,7 +1118,7 @@ bool cmInstallCommand::HandleExportAndroidMKMode( ...@@ -1118,7 +1118,7 @@ bool cmInstallCommand::HandleExportAndroidMKMode(
cmCAEnabler exportOld(&ica.Parser, "EXPORT_LINK_INTERFACE_LIBRARIES", cmCAEnabler exportOld(&ica.Parser, "EXPORT_LINK_INTERFACE_LIBRARIES",
&ica.ArgumentGroup); &ica.ArgumentGroup);
cmCAString filename(&ica.Parser, "FILE", &ica.ArgumentGroup); cmCAString filename(&ica.Parser, "FILE", &ica.ArgumentGroup);
exp.Follows(0); exp.Follows(CM_NULLPTR);
ica.ArgumentGroup.Follows(&exp); ica.ArgumentGroup.Follows(&exp);
std::vector<std::string> unknownArgs; std::vector<std::string> unknownArgs;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef CM_AUTO_PTR_HXX #ifndef CM_AUTO_PTR_HXX
#define 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. // FIXME: Use std::auto_ptr on compilers that do not warn about it.
#define CM_AUTO_PTR cm::auto_ptr #define CM_AUTO_PTR cm::auto_ptr
...@@ -115,7 +115,7 @@ public: ...@@ -115,7 +115,7 @@ public:
* *
* auto_ptr<X> ptr(new X()); * auto_ptr<X> ptr(new X());
*/ */
explicit auto_ptr(X* p = 0) throw() explicit auto_ptr(X* p = CM_NULLPTR) throw()
: x_(p) : x_(p)
{ {
} }
...@@ -157,7 +157,7 @@ public: ...@@ -157,7 +157,7 @@ public:
X* release() throw() X* release() throw()
{ {
X* x = this->x_; X* x = this->x_;
this->x_ = 0; this->x_ = CM_NULLPTR;
return x; return x;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment