[Cmake-commits] CMake branch, next, updated. v3.5.2-1250-g7eb4b75

[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  7eb4b754e7b1588df421d0b3d8f32bdf0ebb0d17 (commit)
       via  fd28d84efaba4dffc97b62a8676ab34711285277 (commit)
      from  cb2e171b63dc6b0e41973d81a295189adb2342a7 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eb4b754e7b1588df421d0b3d8f32bdf0ebb0d17
commit 7eb4b754e7b1588df421d0b3d8f32bdf0ebb0d17
Merge: cb2e171 fd28d84
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 5 12:56:13 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 5 12:56:13 2016 -0400

    Merge topic 'ghs-hash-object-locations' into next
    
    fd28d84e fixup! GHS: Shorten long object paths with duplicate source names


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd28d84efaba4dffc97b62a8676ab34711285277
commit fd28d84efaba4dffc97b62a8676ab34711285277
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 5 12:56:04 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 5 12:56:04 2016 -0400

    fixup! GHS: Shorten long object paths with duplicate source names

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index ddb33cd..4ca59cb 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -492,7 +492,7 @@ cmGhsMultiTargetGenerator::GetObjectNames(
     cmLocalGhsMultiGenerator *const localGhsMultiGenerator,
     cmGeneratorTarget *const generatorTarget)
 {
-  std::map<std::string, std::vector<cmSourceFile *>> filenameToSource;
+  std::map<std::string, std::vector<cmSourceFile *> > filenameToSource;
   std::map<cmSourceFile *, std::string> sourceToFilename;
   for(std::vector<cmSourceFile *>::const_iterator
       sf = objectSources->begin(); sf != objectSources->end(); ++sf)
@@ -505,7 +505,7 @@ cmGhsMultiTargetGenerator::GetObjectNames(
     }
 
   std::vector<cmSourceFile *> duplicateSources;
-  for (std::map<std::string, std::vector<cmSourceFile *>>::const_iterator
+  for (std::map<std::string, std::vector<cmSourceFile *> >::const_iterator
        msvSourceI = filenameToSource.begin();
        msvSourceI != filenameToSource.end(); ++msvSourceI)
     {

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

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake