Merge topic 'clean-up-cmExecutionStatus'

2a44acb9 cmExecutionStatus: Remove inheritance of cmObject.
c8c34169 cmExecutionStatus: De-virtualize API.
This commit is contained in:
Brad King 2015-05-19 11:09:24 -04:00 committed by CMake Topic Stage
commit 43aa5c6ca1
1 changed files with 13 additions and 16 deletions

View File

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