[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-595-g724554c

[Daniel Pfeifer]

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  724554c78f73c871c3b67a9498c1db15fd1c43f7 (commit)
       via  4e8480db5425e0acbbd6394593417aab2a1fc3e5 (commit)
      from  0462af8138566f7d9d47cdfa087f65c89cb70a26 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=724554c78f73c871c3b67a9498c1db15fd1c43f7
commit 724554c78f73c871c3b67a9498c1db15fd1c43f7
Merge: 0462af8 4e8480d
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Jun 29 05:54:05 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 29 05:54:05 2016 -0400

    Merge topic 'CM_OVERRIDE-cmTypeMacro' into next
    
    4e8480db cmTypeMacro: mark overridden functions with CM_OVERRIDE


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e8480db5425e0acbbd6394593417aab2a1fc3e5
commit 4e8480db5425e0acbbd6394593417aab2a1fc3e5
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Wed Jun 29 09:31:51 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Jun 29 11:48:50 2016 +0200

    cmTypeMacro: mark overridden functions with CM_OVERRIDE

diff --git a/Source/cmTypeMacro.h b/Source/cmTypeMacro.h
index 5c534c3..147eba8 100644
--- a/Source/cmTypeMacro.h
+++ b/Source/cmTypeMacro.h
@@ -15,7 +15,7 @@
 // All subclasses of cmCommand or cmCTestGenericHandler should
 // invoke this macro.
 #define cmTypeMacro(thisClass, superclass)                                    \
-  virtual const char* GetNameOfClass() { return #thisClass; }                 \
+  const char* GetNameOfClass() CM_OVERRIDE { return #thisClass; }             \
   typedef superclass Superclass;                                              \
   static bool IsTypeOf(const char* type)                                      \
   {                                                                           \
@@ -24,7 +24,10 @@
     }                                                                         \
     return Superclass::IsTypeOf(type);                                        \
   }                                                                           \
-  virtual bool IsA(const char* type) { return thisClass::IsTypeOf(type); }    \
+  bool IsA(const char* type) CM_OVERRIDE                                      \
+  {                                                                           \
+    return thisClass::IsTypeOf(type);                                         \
+  }                                                                           \
   static thisClass* SafeDownCast(cmObject* c)                                 \
   {                                                                           \
     if (c && c->IsA(#thisClass)) {                                            \

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTypeMacro.h |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake