Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
782fcbb9
Commit
782fcbb9
authored
Sep 16, 2016
by
Daniel Pfeifer
Browse files
Use CM_NULLPTR
parent
809ca6c8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Source/cmGetPropertyCommand.cxx
View file @
782fcbb9
...
...
@@ -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_
NULL
PTR
);
}
return
this
->
StoreResult
(
target
->
GetProperty
(
this
->
PropertyName
,
this
->
Makefile
));
...
...
Source/cmInstallCommand.cxx
View file @
782fcbb9
...
...
@@ -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
;
...
...
Source/cm_auto_ptr.hxx
View file @
782fcbb9
...
...
@@ -12,7 +12,7 @@
#ifndef CM_AUTO_PTR_HXX
#define CM_AUTO_PTR_HXX
#include <cm
sys/
Configure.h
xx
>
#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
;
}
...
...
Brad King
@brad.king
mentioned in commit
995d6be1
·
Sep 19, 2016
mentioned in commit
995d6be1
mentioned in commit 995d6be1282cb1f7c92bb136be10163a704e7d10
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment