Browse Source

cmCustomCommand: Re-arrange data layout.

Size goes from 240 to 224 bytes.
Stephen Kelly 10 years ago
parent
commit
34e1d6db72
2 changed files with 8 additions and 10 deletions
  1. 5 7
      Source/cmCustomCommand.cxx
  2. 3 3
      Source/cmCustomCommand.h

+ 5 - 7
Source/cmCustomCommand.cxx

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

+ 3 - 3
Source/cmCustomCommand.h

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