Merge topic 'clean-up-cmExecutionStatus'

2a44acb9 cmExecutionStatus: Remove inheritance of cmObject.
c8c34169 cmExecutionStatus: De-virtualize API.

1 files changed, 13 insertions, 16 deletions

diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index d4da5a4..201465d 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -12,47 +12,44 @@
 #ifndef cmExecutionStatus_h
 #define cmExecutionStatus_h
 
-#include "cmObject.h"
+#include "cmStandardIncludes.h"
 
 /** \class cmExecutionStatus
  * \brief Superclass for all command status classes
  *
  * when a command is involked it may set values on a command status instance
  */
-class cmExecutionStatus : public cmObject
+class cmExecutionStatus
 {
 public:
-  cmTypeMacro(cmExecutionStatus, cmObject);
+  cmExecutionStatus() { this->Clear(); }
 
-  cmExecutionStatus() { this->Clear();}
-
-  virtual void SetReturnInvoked(bool val)
+  void SetReturnInvoked(bool val)
   { this->ReturnInvoked = val; }
-  virtual bool GetReturnInvoked()
+  bool GetReturnInvoked()
   { return this->ReturnInvoked; }
 
-  virtual void SetBreakInvoked(bool val)
+  void SetBreakInvoked(bool val)
   { this->BreakInvoked = val; }
-  virtual bool GetBreakInvoked()
+  bool GetBreakInvoked()
   { return this->BreakInvoked; }
 
-  virtual void SetContinueInvoked(bool val)
+  void SetContinueInvoked(bool val)
   { this->ContinueInvoked = val; }
-  virtual bool GetContinueInvoked()
+  bool GetContinueInvoked()
   { return this->ContinueInvoked; }
 
-  virtual void Clear()
+  void Clear()
     {
     this->ReturnInvoked = false;
     this->BreakInvoked = false;
     this->ContinueInvoked = false;
     this->NestedError = false;
     }
-  virtual void SetNestedError(bool val) { this->NestedError = val; }
-  virtual bool GetNestedError() { return this->NestedError; }
-
+  void SetNestedError(bool val) { this->NestedError = val; }
+  bool GetNestedError() { return this->NestedError; }
 
-protected:
+private:
   bool ReturnInvoked;
   bool BreakInvoked;
   bool ContinueInvoked;