[Cmake-commits] CMake branch, next, updated. v2.8.7-3163-ge1556c1

[Brad King]

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  e1556c109f0efd80e9ed1ecfb98791465abe21e6 (commit)
       via  64f3d1f62f3bcb3be6fb49d60da0abbecfdce705 (commit)
      from  d6e133dc50ce81ac981bfec0213dc9d202643412 (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=e1556c109f0efd80e9ed1ecfb98791465abe21e6
commit e1556c109f0efd80e9ed1ecfb98791465abe21e6
Merge: d6e133d 64f3d1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 13 11:52:34 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 13 11:52:34 2012 -0400

    Merge topic 'ninja-generator' into next
    
    64f3d1f Ninja: Constify use of cmCustomCommand


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64f3d1f62f3bcb3be6fb49d60da0abbecfdce705
commit 64f3d1f62f3bcb3be6fb49d60da0abbecfdce705
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 13 09:17:46 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 13 11:26:29 2012 -0400

    Ninja: Constify use of cmCustomCommand
    
    The generator never needs to modify custom command instances.

diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index e77252f..39df826 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -270,7 +270,7 @@ private:
 
   /// Called when we have seen the given custom command.  Returns true
   /// if we has seen it before.
-  bool SeenCustomCommand(cmCustomCommand *cc) {
+  bool SeenCustomCommand(cmCustomCommand const *cc) {
     return !this->CustomCommands.insert(cc).second;
   }
 
@@ -315,7 +315,7 @@ private:
   cmNinjaDeps AllDependencies;
 
   /// The set of custom commands we have seen.
-  std::set<cmCustomCommand *> CustomCommands;
+  std::set<cmCustomCommand const*> CustomCommands;
 
   /// The set of custom command outputs we have seen.
   std::set<std::string> CustomCommandOutputs;
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index ea03cbb..78072b5 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -343,8 +343,8 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(const cmCustomCommand *cc,
 }
 
 void
-cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(cmCustomCommand *cc,
-                                            const cmNinjaDeps& orderOnlyDeps)
+cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
+  cmCustomCommand const *cc, const cmNinjaDeps& orderOnlyDeps)
 {
   if (this->GetGlobalNinjaGenerator()->SeenCustomCommand(cc))
     return;
@@ -383,7 +383,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(cmCustomCommand *cc,
   }
 }
 
-void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand* cc,
+void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc,
                                                    cmTarget* target)
 {
   this->CustomCommandTargets[cc].insert(target);
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index e9bbf43..28b431d 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -118,17 +118,17 @@ private:
   void AppendCustomCommandLines(const cmCustomCommand *cc,
                                 std::vector<std::string> &cmdLines);
   void WriteCustomCommandRule();
-  void WriteCustomCommandBuildStatement(cmCustomCommand *cc,
+  void WriteCustomCommandBuildStatement(cmCustomCommand const *cc,
                                         const cmNinjaDeps& orderOnlyDeps);
 
-  void AddCustomCommandTarget(cmCustomCommand* cc, cmTarget* target);
+  void AddCustomCommandTarget(cmCustomCommand const* cc, cmTarget* target);
   void WriteCustomCommandBuildStatements();
 
 private:
   std::string ConfigName;
   std::string HomeRelativeOutputPath;
 
-  typedef std::map<cmCustomCommand*, std::set<cmTarget*> >
+  typedef std::map<cmCustomCommand const*, std::set<cmTarget*> >
     CustomCommandTargetMap;
   CustomCommandTargetMap CustomCommandTargets;
 };

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.h  |    4 ++--
 Source/cmLocalNinjaGenerator.cxx |    6 +++---
 Source/cmLocalNinjaGenerator.h   |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake