cmMakefile: Make cmListFileBacktrace default constructible.

This commit is contained in:
Stephen Kelly 2015-05-30 13:17:55 +02:00
parent b68f2ea8ae
commit 52919ac8ac
8 changed files with 10 additions and 10 deletions

View File

@ -17,7 +17,7 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmCustomCommand::cmCustomCommand() cmCustomCommand::cmCustomCommand()
: Backtrace(NULL) : Backtrace()
{ {
this->HaveComment = false; this->HaveComment = false;
this->EscapeOldStyle = true; this->EscapeOldStyle = true;
@ -82,7 +82,7 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf,
WorkingDirectory(workingDirectory?workingDirectory:""), WorkingDirectory(workingDirectory?workingDirectory:""),
EscapeAllowMakeVars(false), EscapeAllowMakeVars(false),
EscapeOldStyle(true), EscapeOldStyle(true),
Backtrace(NULL) Backtrace()
{ {
this->EscapeOldStyle = true; this->EscapeOldStyle = true;
this->EscapeAllowMakeVars = false; this->EscapeAllowMakeVars = false;

View File

@ -18,7 +18,7 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmExportBuildFileGenerator::cmExportBuildFileGenerator() cmExportBuildFileGenerator::cmExportBuildFileGenerator()
: Backtrace(NULL) : Backtrace()
{ {
this->Makefile = 0; this->Makefile = 0;
this->ExportSet = 0; this->ExportSet = 0;

View File

@ -34,7 +34,7 @@ cmGeneratorExpression::Parse(std::string const& input)
{ {
return cmsys::auto_ptr<cmCompiledGeneratorExpression>( return cmsys::auto_ptr<cmCompiledGeneratorExpression>(
new cmCompiledGeneratorExpression( new cmCompiledGeneratorExpression(
this->Backtrace ? *this->Backtrace : cmListFileBacktrace(NULL), this->Backtrace ? *this->Backtrace : cmListFileBacktrace(),
input)); input));
} }

View File

@ -35,7 +35,7 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
const GeneratorExpressionContent *content, const GeneratorExpressionContent *content,
cmGeneratorExpressionDAGChecker *parent) cmGeneratorExpressionDAGChecker *parent)
: Parent(parent), Target(target), Property(property), : Parent(parent), Target(target), Property(property),
Content(content), Backtrace(NULL), TransitivePropertiesOnly(false) Content(content), Backtrace(), TransitivePropertiesOnly(false)
{ {
Initialize(); Initialize();
} }

View File

@ -74,7 +74,7 @@ struct cmListFileFunction: public cmListFileContext
class cmListFileBacktrace: private std::vector<cmListFileContext> class cmListFileBacktrace: private std::vector<cmListFileContext>
{ {
public: public:
cmListFileBacktrace(cmLocalGenerator* localGen) cmListFileBacktrace(cmLocalGenerator* localGen = 0)
: LocalGenerator(localGen) : LocalGenerator(localGen)
, Relative(localGen ? false : true) , Relative(localGen ? false : true)
{ {

View File

@ -94,13 +94,13 @@ class cmTargetInternals
{ {
public: public:
cmTargetInternals() cmTargetInternals()
: Backtrace(NULL) : Backtrace()
{ {
this->PolicyWarnedCMP0022 = false; this->PolicyWarnedCMP0022 = false;
this->UtilityItemsDone = false; this->UtilityItemsDone = false;
} }
cmTargetInternals(cmTargetInternals const&) cmTargetInternals(cmTargetInternals const&)
: Backtrace(NULL) : Backtrace()
{ {
this->PolicyWarnedCMP0022 = false; this->PolicyWarnedCMP0022 = false;
this->UtilityItemsDone = false; this->UtilityItemsDone = false;

View File

@ -66,7 +66,7 @@ public:
class cmLinkImplItem: public cmLinkItem class cmLinkImplItem: public cmLinkItem
{ {
public: public:
cmLinkImplItem(): cmLinkItem(), Backtrace(0), FromGenex(false) {} cmLinkImplItem(): cmLinkItem(), Backtrace(), FromGenex(false) {}
cmLinkImplItem(std::string const& n, cmLinkImplItem(std::string const& n,
cmTarget const* t, cmTarget const* t,
cmListFileBacktrace const& bt, cmListFileBacktrace const& bt,

View File

@ -301,7 +301,7 @@ class cmake
/** Display a message to the user. */ /** Display a message to the user. */
void IssueMessage(cmake::MessageType t, std::string const& text, void IssueMessage(cmake::MessageType t, std::string const& text,
cmListFileBacktrace const& backtrace = cmListFileBacktrace(NULL)); cmListFileBacktrace const& backtrace = cmListFileBacktrace());
void IssueMessage(cmake::MessageType t, std::string const& text, void IssueMessage(cmake::MessageType t, std::string const& text,
cmListFileContext const& lfc); cmListFileContext const& lfc);