[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6882-ge873c33

[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  e873c338814302fc47a4bb7c85fb05d8b3420e42 (commit)
       via  ead39198371b96d997a4910804e3b78e77426786 (commit)
       via  29e1f0659e96258d2a332965f1097d634039f36d (commit)
      from  061225676800d025654ac97720630880fcee20fe (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=e873c338814302fc47a4bb7c85fb05d8b3420e42
commit e873c338814302fc47a4bb7c85fb05d8b3420e42
Merge: 0612256 ead3919
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 8 13:41:20 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 8 13:41:20 2014 -0500

    Merge topic 'minor-cleanups' into next
    
    ead3919 Attempt to fix Borland.
    29e1f06 Fix build on Windows.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ead39198371b96d997a4910804e3b78e77426786
commit ead39198371b96d997a4910804e3b78e77426786
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 8 19:33:19 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jan 8 19:33:19 2014 +0100

    Attempt to fix Borland.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 674b8de..498b3ec 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -129,7 +129,9 @@ void cmGeneratorTarget::AddExplicitObjectName(cmSourceFile* sf)
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasExplicitObjectName(cmSourceFile const* file) const
 {
-  return this->ExplicitObjectName.find(file) != this->ExplicitObjectName.end();
+  std::set<cmSourceFile const*>::const_iterator it
+                                        = this->ExplicitObjectName.find(file);
+  return it != this->ExplicitObjectName.end();
 }
 
 //----------------------------------------------------------------------------

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29e1f0659e96258d2a332965f1097d634039f36d
commit 29e1f0659e96258d2a332965f1097d634039f36d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 8 19:28:29 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jan 8 19:29:34 2014 +0100

    Fix build on Windows.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a475c40..fb12521 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -314,7 +314,7 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
   // get the classes from the source lists then add them to the groups
-  std::vector<cmSourceFile*>& classes;
+  std::vector<cmSourceFile*> classes;
   target.GetSourceFiles(classes);
 
   // now all of the source files have been properly assigned to the target
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index e790b92..57a4880 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1381,7 +1381,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
 
   // get the classes from the source lists then add them to the groups
   this->ModuleDefinitionFile = "";
-  std::vector<cmSourceFile*>& classes;
+  std::vector<cmSourceFile*> classes;
   target.GetSourceFiles(classes);
   for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
       i != classes.end(); i++)

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

Summary of changes:
 Source/cmGeneratorTarget.cxx             |    4 +++-
 Source/cmLocalVisualStudio6Generator.cxx |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake