[Cmake-commits] CMake branch, next, updated. v3.5.2-1054-g529bab6

[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  529bab6793427b69f0e122652ec1d59b6cafe803 (commit)
       via  a2df75369fa5835aa508ead123900c502006229c (commit)
      from  860c13c059f6f434756365516f43673d41780218 (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=529bab6793427b69f0e122652ec1d59b6cafe803
commit 529bab6793427b69f0e122652ec1d59b6cafe803
Merge: 860c13c a2df753
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 21 08:14:13 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 21 08:14:13 2016 -0400

    Merge topic 'autogen-updates' into next
    
    a2df7536 fixup! Autogen: Check added for name collisions of generated moc files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2df75369fa5835aa508ead123900c502006229c
commit a2df75369fa5835aa508ead123900c502006229c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 20 16:19:24 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 20 16:19:24 2016 -0400

    fixup! Autogen: Check added for name collisions of generated moc files

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index c6ee751..60e26b4 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1572,7 +1572,9 @@ bool cmQtAutoGenerators::NameCollisionTest(
               collisions.insert(VType(ait->second, ait->first));
               }
             collisions.insert(VType(bit->second, bit->first));
-            bit = localGen.erase ( bit );
+            Iter old = bit;
+            ++bit;
+            localGen.erase(old);
           }
         else
           {

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake