[Cmake-commits] CMake branch, next, updated. v2.8.2-549-g2e30a0f

[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  2e30a0f5bb2e7fdd6cec721ff5097b0781f8804d (commit)
       via  95b3bb5dbcb6021f07329f5bc400b1a205386970 (commit)
      from  2543bfbc4cfcc4973bc8b09240fc445cbc10b71b (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=2e30a0f5bb2e7fdd6cec721ff5097b0781f8804d
commit 2e30a0f5bb2e7fdd6cec721ff5097b0781f8804d
Merge: 2543bfb 95b3bb5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 26 10:00:35 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 26 10:00:35 2010 -0400

    Merge topic 'target-dependencies-const' into next
    
    95b3bb5 Restore GetTargetDirectDepends const return


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95b3bb5dbcb6021f07329f5bc400b1a205386970
commit 95b3bb5dbcb6021f07329f5bc400b1a205386970
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 20 13:16:43 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 25 17:05:01 2010 -0400

    Restore GetTargetDirectDepends const return
    
    The returned set should never be modified.  Restore 'const' correctness
    unnecessarily removed by commit 6903d2df (remove const, 2008-01-30).

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index bd26b5f..fbc578b 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1487,7 +1487,7 @@ void cmGlobalGenerator::FillLocalGeneratorToTargetMap()
         // Add dependencies of the included target.  An excluded
         // target may still be included if it is a dependency of a
         // non-excluded target.
-        TargetDependSet & tgtdeps = this->GetTargetDirectDepends(target);
+        TargetDependSet const& tgtdeps = this->GetTargetDirectDepends(target);
         for(TargetDependSet::const_iterator ti = tgtdeps.begin();
             ti != tgtdeps.end(); ++ti)
           {
@@ -1879,7 +1879,7 @@ void cmGlobalGenerator::AppendDirectoryForConfig(const char*, const char*,
 }
 
 //----------------------------------------------------------------------------
-cmGlobalGenerator::TargetDependSet &
+cmGlobalGenerator::TargetDependSet const&
 cmGlobalGenerator::GetTargetDirectDepends(cmTarget & target)
 {
   return this->TargetDependencies[&target];
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 878be11..9d5aa57 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -238,7 +238,7 @@ public:
 
   // what targets does the specified target depend on directly
   // via a target_link_libraries or add_dependencies
-  TargetDependSet & GetTargetDirectDepends(cmTarget & target);
+  TargetDependSet const& GetTargetDirectDepends(cmTarget & target);
 
   const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap()
                                                const {return this->ProjectMap;}
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 59e20d5..2af7036 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1413,7 +1413,7 @@ void cmVisualStudio10TargetGenerator::WriteEvent(
 
 void cmVisualStudio10TargetGenerator::WriteProjectReferences()
 {
-  cmGlobalGenerator::TargetDependSet& depends
+  cmGlobalGenerator::TargetDependSet const& depends
     = this->GlobalGenerator->GetTargetDirectDepends(*this->Target);
   this->WriteString("<ItemGroup>\n", 1);
   for( cmGlobalGenerator::TargetDependSet::const_iterator i = depends.begin();

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

Summary of changes:
 Source/cmGlobalGenerator.cxx               |    4 ++--
 Source/cmGlobalGenerator.h                 |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake