[Cmake-commits] CMake branch, next, updated. v3.2.2-2789-g58ed6bf
Stephen Kelly
steveire at gmail.com
Sat May 16 01:08:19 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 58ed6bf4ea9f6aa4fd5119c53b5b2b86922c7afa (commit)
via 2a44acb937fb602f3beff739f7884ba0f483aa3b (commit)
via c8c341690f62b01392c487ec68ca39c578be170b (commit)
via ebf8a41984f591dbd6c22735aec7f2b1c36c9e0a (commit)
from b19b7dde4e693b485bdcffd4d58d1efa177b9e3c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58ed6bf4ea9f6aa4fd5119c53b5b2b86922c7afa
commit 58ed6bf4ea9f6aa4fd5119c53b5b2b86922c7afa
Merge: b19b7dd 2a44acb
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 16 01:08:18 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 16 01:08:18 2015 -0400
Merge topic 'clean-up-cmExecutionStatus' into next
2a44acb9 cmExecutionStatus: Remove inheritance of cmObject.
c8c34169 cmExecutionStatus: De-virtualize API.
ebf8a419 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a44acb937fb602f3beff739f7884ba0f483aa3b
commit 2a44acb937fb602f3beff739f7884ba0f483aa3b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 16 07:06:59 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 16 07:06:59 2015 +0200
cmExecutionStatus: Remove inheritance of cmObject.
It is not needed.
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index 6d3fac6..201465d 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -12,19 +12,17 @@
#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(); }
void SetReturnInvoked(bool val)
{ this->ReturnInvoked = val; }
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8c341690f62b01392c487ec68ca39c578be170b
commit c8c341690f62b01392c487ec68ca39c578be170b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 16 07:06:39 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 16 07:06:39 2015 +0200
cmExecutionStatus: De-virtualize API.
It is clearly not required.
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index d4da5a4..6d3fac6 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -26,33 +26,32 @@ public:
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;
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmExecutionStatus.h | 29 +++++++++++++----------------
2 files changed, 14 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list