[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1079-ge1e479a

[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  e1e479a625ad6b9ebc557d8b2264909732115aab (commit)
       via  9f162119009093ef09f69f74d38d2715096703b7 (commit)
      from  b0a50207f80515ca648f5a112f958136fe05179c (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=e1e479a625ad6b9ebc557d8b2264909732115aab
commit e1e479a625ad6b9ebc557d8b2264909732115aab
Merge: b0a5020 9f16211
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 05:15:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 15 05:15:09 2014 -0400

    Merge topic 'target-objects-refactor' into next
    
    9f162119 const_cast.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f162119009093ef09f69f74d38d2715096703b7
commit 9f162119009093ef09f69f74d38d2715096703b7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 10:13:16 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 15 10:13:16 2014 +0100

    const_cast.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 38f63cd..094a113 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -351,7 +351,7 @@ void cmGeneratorTarget::AddExplicitObjectName(cmSourceFile const* sf)
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasExplicitObjectName(cmSourceFile const* file) const
 {
-  this->ComputeObjectMapping();
+  const_cast<cmGeneratorTarget*>(this)->ComputeObjectMapping();
   std::set<cmSourceFile const*>::const_iterator it
                                         = this->ExplicitObjectName.find(file);
   return it != this->ExplicitObjectName.end();

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake