From 34e1d6db722b34bb6b4f7b8a7ea53a0bb61c5f58 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sun, 7 Jun 2015 10:44:59 +0200
Subject: [PATCH] cmCustomCommand: Re-arrange data layout.

Size goes from 240 to 224 bytes.
---
 Source/cmCustomCommand.cxx | 12 +++++-------
 Source/cmCustomCommand.h   | 10 +++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx
index 4032b08e20..7418413c6f 100644
--- a/Source/cmCustomCommand.cxx
+++ b/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();
diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h
index 0bfaef23b2..cc5501fca9 100644
--- a/Source/cmCustomCommand.h
+++ b/Source/cmCustomCommand.h
@@ -93,13 +93,13 @@ private:
   std::vector<std::string> Byproducts;
   std::vector<std::string> Depends;
   cmCustomCommandLines CommandLines;
-  bool HaveComment;
-  std::string Comment;
-  std::string WorkingDirectory;
-  bool EscapeAllowMakeVars;
-  bool EscapeOldStyle;
   cmListFileBacktrace Backtrace;
   ImplicitDependsList ImplicitDepends;
+  std::string Comment;
+  std::string WorkingDirectory;
+  bool HaveComment;
+  bool EscapeAllowMakeVars;
+  bool EscapeOldStyle;
   bool UsesTerminal;
 };