[Cmake-commits] CMake branch, next, updated. v3.2.2-3091-g363b61c

[Stephen Kelly]

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  363b61c72929985373f63d6a5dc61612b66c82ff (commit)
       via  74a835d02a02789a8a53395eb64c812ca98f2415 (commit)
       via  444bc349781205bbfe3de25c6190beb0a7f0d44c (commit)
      from  85ad7c9491fbefc7287fe34297493b5499486413 (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=363b61c72929985373f63d6a5dc61612b66c82ff
commit 363b61c72929985373f63d6a5dc61612b66c82ff
Merge: 85ad7c9 74a835d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 08:57:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 23 08:57:15 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    74a835d0 cmGlobalGenerator: De-virtualize methods with no overrides.
    444bc349 Ninja: Remove some bogus comments.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74a835d02a02789a8a53395eb64c812ca98f2415
commit 74a835d02a02789a8a53395eb64c812ca98f2415
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:52:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 23 14:56:55 2015 +0200

    cmGlobalGenerator: De-virtualize methods with no overrides.

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index f9ea449..e8714ef 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -371,7 +371,7 @@ protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
   // for a project collect all its targets by following depend
   // information, and also collect all the targets
-  virtual void GetTargetSets(TargetDependSet& projectTargets,
+  void GetTargetSets(TargetDependSet& projectTargets,
                              TargetDependSet& originalTargets,
                              cmLocalGenerator* root, GeneratorVector const&);
   bool IsRootOnlyTarget(cmTarget* target) const;
@@ -446,7 +446,7 @@ protected:
   TargetMap ImportedTargets;
   std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
 
-  virtual const char* GetPredefinedTargetsFolder();
+  const char* GetPredefinedTargetsFolder();
   virtual bool UseFolderProperty();
 
 private:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=444bc349781205bbfe3de25c6190beb0a7f0d44c
commit 444bc349781205bbfe3de25c6190beb0a7f0d44c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 23 14:49:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 23 14:56:33 2015 +0200

    Ninja: Remove some bogus comments.
    
    The virtual methods are overrides not overloads, the constructor
    is no longer a default variant, the destructor and GetCMakeInstance
    comments add no value, only a typo.

diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index 3a6e030..08b10e6 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -31,28 +31,19 @@ class cmake;
 class cmLocalNinjaGenerator : public cmLocalGenerator
 {
 public:
-  /// Default constructor.
   cmLocalNinjaGenerator(cmGlobalGenerator* gg, cmLocalGenerator* parent);
 
-  /// Destructor.
   virtual ~cmLocalNinjaGenerator();
 
-  /// Overloaded methods. @see cmLocalGenerator::Generate()
   virtual void Generate();
 
-  /// Overloaded methods. @see cmLocalGenerator::Configure()
   virtual void Configure();
 
-  /// Overloaded methods. @see cmLocalGenerator::GetTargetDirectory()
   virtual std::string GetTargetDirectory(cmTarget const& target) const;
 
   const cmGlobalNinjaGenerator* GetGlobalNinjaGenerator() const;
   cmGlobalNinjaGenerator* GetGlobalNinjaGenerator();
 
-  /**
-   * Shortcut to get the cmake instance throw the global generator.
-   * @return an instance of the cmake object.
-   */
   const cmake* GetCMakeInstance() const;
   cmake* GetCMakeInstance();
 

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

Summary of changes:
 Source/cmGlobalGenerator.h     |    4 ++--
 Source/cmLocalNinjaGenerator.h |    9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake