cmCustomCommand: Re-arrange data layout.

Size goes from 240 to 224 bytes.
This commit is contained in:
Stephen Kelly 2015-06-07 10:44:59 +02:00
parent 54cb76f299
commit 34e1d6db72
2 changed files with 10 additions and 12 deletions

View File

@ -31,12 +31,12 @@ cmCustomCommand::cmCustomCommand(const cmCustomCommand& r):
Byproducts(r.Byproducts), Byproducts(r.Byproducts),
Depends(r.Depends), Depends(r.Depends),
CommandLines(r.CommandLines), CommandLines(r.CommandLines),
HaveComment(r.HaveComment), Backtrace(r.Backtrace),
Comment(r.Comment), Comment(r.Comment),
WorkingDirectory(r.WorkingDirectory), WorkingDirectory(r.WorkingDirectory),
HaveComment(r.HaveComment),
EscapeAllowMakeVars(r.EscapeAllowMakeVars), EscapeAllowMakeVars(r.EscapeAllowMakeVars),
EscapeOldStyle(r.EscapeOldStyle), EscapeOldStyle(r.EscapeOldStyle),
Backtrace(r.Backtrace),
UsesTerminal(r.UsesTerminal) UsesTerminal(r.UsesTerminal)
{ {
} }
@ -77,15 +77,13 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf,
Byproducts(byproducts), Byproducts(byproducts),
Depends(depends), Depends(depends),
CommandLines(commandLines), CommandLines(commandLines),
HaveComment(comment?true:false), Backtrace(),
Comment(comment?comment:""), Comment(comment?comment:""),
WorkingDirectory(workingDirectory?workingDirectory:""), WorkingDirectory(workingDirectory?workingDirectory:""),
HaveComment(comment?true:false),
EscapeAllowMakeVars(false), EscapeAllowMakeVars(false),
EscapeOldStyle(true), EscapeOldStyle(true)
Backtrace()
{ {
this->EscapeOldStyle = true;
this->EscapeAllowMakeVars = false;
if(mf) if(mf)
{ {
this->Backtrace = mf->GetBacktrace(); this->Backtrace = mf->GetBacktrace();

View File

@ -93,13 +93,13 @@ private:
std::vector<std::string> Byproducts; std::vector<std::string> Byproducts;
std::vector<std::string> Depends; std::vector<std::string> Depends;
cmCustomCommandLines CommandLines; cmCustomCommandLines CommandLines;
bool HaveComment;
std::string Comment;
std::string WorkingDirectory;
bool EscapeAllowMakeVars;
bool EscapeOldStyle;
cmListFileBacktrace Backtrace; cmListFileBacktrace Backtrace;
ImplicitDependsList ImplicitDepends; ImplicitDependsList ImplicitDepends;
std::string Comment;
std::string WorkingDirectory;
bool HaveComment;
bool EscapeAllowMakeVars;
bool EscapeOldStyle;
bool UsesTerminal; bool UsesTerminal;
}; };