mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

use CM_NULLPTR

Browse Source
This commit is contained in:
Daniel Pfeifer
2016-06-27 22:44:16 +02:00
committed by Brad King
parent b4b73f56a2
commit 1d6909a287
201 changed files with 1143 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmLocalUnixMakefileGenerator3.h
View File

@@ -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()
{
}