summaryrefslogtreecommitdiff
path: root/Source/cmLocalUnixMakefileGenerator3.h
diff options
context:
space:
mode:
authorDaniel Pfeifer <daniel@pfeifer-mail.de>2016-06-27 22:44:16 +0200
committerBrad King <brad.king@kitware.com>2016-06-28 09:02:26 -0400
commit1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb (patch)
tree3c13e63f2529d877b865475b5269a96ef5e0a4cb /Source/cmLocalUnixMakefileGenerator3.h
parentb4b73f56a26c1e1d630e3f262d2d4bafee8231c4 (diff)
downloadcmake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.gz
use CM_NULLPTR
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.h')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 319a587cf3..42d1d9167d 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -110,7 +110,8 @@ public:
std::string Arg;
};
void AppendEcho(std::vector<std::string>& commands, std::string const& text,
- EchoColor color = EchoNormal, EchoProgress const* = 0);
+ EchoColor color = EchoNormal,
+ EchoProgress const* = CM_NULLPTR);
/** Get whether the makefile is to have color. */
bool GetColorMakefile() const { return this->ColorMakefile; }
@@ -236,10 +237,11 @@ protected:
std::vector<std::string>& commands, cmCustomCommandGenerator const& ccg,
cmGeneratorTarget* target, bool echo_comment = false,
cmOutputConverter::RelativeRoot relative = cmOutputConverter::HOME_OUTPUT,
- std::ostream* content = 0);
+ std::ostream* content = CM_NULLPTR);
void AppendCleanCommand(std::vector<std::string>& commands,
const std::vector<std::string>& files,
- cmGeneratorTarget* target, const char* filename = 0);
+ cmGeneratorTarget* target,
+ const char* filename = CM_NULLPTR);
// Helper methods for dependeny updates.
bool ScanDependencies(
@@ -256,7 +258,7 @@ private:
void ComputeObjectFilenames(
std::map<cmSourceFile const*, std::string>& mapping,
- cmGeneratorTarget const* gt = 0) CM_OVERRIDE;
+ cmGeneratorTarget const* gt = CM_NULLPTR) CM_OVERRIDE;
friend class cmMakefileTargetGenerator;
friend class cmMakefileExecutableTargetGenerator;
@@ -273,7 +275,7 @@ private:
cmGeneratorTarget* Target;
std::string Language;
LocalObjectEntry()
- : Target(0)
+ : Target(CM_NULLPTR)
, Language()
{
}