[Cmake-commits] CMake branch, next, updated. v3.0.2-2083-g91731c0
Joe Snyder
joe.snyder at kitware.com
Thu Oct 16 11:21:25 EDT 2014
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 91731c0eedc11154ac4b32952a78a3cd8a1d8edc (commit)
via 997a110a80416d40307eaa2ea6ccb52ba47c9eb2 (commit)
from 05ba09fc6e695dcbca39289c756f15c7b02f3e5b (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=91731c0eedc11154ac4b32952a78a3cd8a1d8edc
commit 91731c0eedc11154ac4b32952a78a3cd8a1d8edc
Merge: 05ba09f 997a110
Author: Joe Snyder <joe.snyder at kitware.com>
AuthorDate: Thu Oct 16 11:21:24 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 16 11:21:24 2014 -0400
Merge topic 'add_delphi_coverage' into next
997a110a CTest: Fix warning and cleanup
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=997a110a80416d40307eaa2ea6ccb52ba47c9eb2
commit 997a110a80416d40307eaa2ea6ccb52ba47c9eb2
Author: Joseph Snyder <joe.snyder at kitware.com>
AuthorDate: Thu Oct 16 11:14:53 2014 -0400
Commit: Joseph Snyder <joe.snyder at kitware.com>
CommitDate: Thu Oct 16 11:14:53 2014 -0400
CTest: Fix warning and cleanup
Fix the commit based on warning found on Dashboard:
Change all position holder values to size_t from int
Add newline to end of .h file
Clean up some unnecessary lines.
diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx
index 277c270..0dd7b55 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -94,18 +94,16 @@ class cmParseDelphiCoverage::HTMLParser
}
bool ParseFile(const char* file)
{
- std::string line;
+ std::string line=file;
std::string lineresult;
std::string lastroutine;
std::string filename;
std::string filelineoffset;
- int afterLineNum;
+ size_t afterLineNum = 0;
size_t lastoffset = 0;
- int endcovpos = 0;
- int endnamepos = 0;
- int pos = 0;
- int count =1;
- line=file;
+ size_t endcovpos = 0;
+ size_t endnamepos = 0;
+ size_t pos = 0;
/*
* This first 'while' section goes through the found HTML
@@ -140,7 +138,6 @@ class cmParseDelphiCoverage::HTMLParser
pos = lastoffset+1;
endnamepos = 0;
lastoffset =0;
- count++;
}
/*
* Glob through the source directory for the
diff --git a/Source/CTest/cmParseDelphiCoverage.h b/Source/CTest/cmParseDelphiCoverage.h
index b5ba112..c8a01f6 100644
--- a/Source/CTest/cmParseDelphiCoverage.h
+++ b/Source/CTest/cmParseDelphiCoverage.h
@@ -42,4 +42,4 @@ protected:
cmCTestCoverageHandlerContainer& Coverage;
cmCTest* CTest;
};
-#endif
\ No newline at end of file
+#endif
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmParseDelphiCoverage.cxx | 13 +++++--------
Source/CTest/cmParseDelphiCoverage.h | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list