[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4044-g67d85aa

[Zack Galbreath]

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  67d85aa33171d1a177136690259f65b8eea256e7 (commit)
       via  32d5dc5d42a45e88287295a588d1b8529da5bfdc (commit)
       via  4e7a4a0453f1bd7264d414e6f5b62ff61b0d2396 (commit)
      from  0fe513e799a61149718091382f385c0199e179c5 (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=67d85aa33171d1a177136690259f65b8eea256e7
commit 67d85aa33171d1a177136690259f65b8eea256e7
Merge: 0fe513e 32d5dc5
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Aug 29 09:57:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 29 09:57:53 2013 -0400

    Merge topic 'fix_line_offset_bug' into next
    
    32d5dc5 fix bug in cmParseGTMCoverage::ReadMCovFile()
    4e7a4a0 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32d5dc5d42a45e88287295a588d1b8529da5bfdc
commit 32d5dc5d42a45e88287295a588d1b8529da5bfdc
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Aug 29 09:55:04 2013 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Thu Aug 29 09:55:04 2013 -0400

    fix bug in cmParseGTMCoverage::ReadMCovFile()
    
    If it did not find the function, then the lineoffset should not be put
    into lastlineoffset.
    
    This fix courtesy of Bill Hoffman.

diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx
index 5dfcfe5..e05c263 100644
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/Source/CTest/cmParseGTMCoverage.cxx
@@ -106,8 +106,8 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file)
         cmCTestCoverageHandlerContainer::SingleFileCoverageVector&
           coverageVector = this->Coverage.TotalCoverage[filepath];
         coverageVector[lineoffset + linenumber] += count;
+        lastoffset = lineoffset;
         }
-      lastoffset = lineoffset;
       }
     else
       {

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

Summary of changes:
 Source/CMakeVersion.cmake           |    2 +-
 Source/CTest/cmParseGTMCoverage.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake