[Cmake-commits] [cmake-commits] david.cole committed cmCTestBuildHandler.cxx 1.76 1.77 cmCTestCoverageHandler.cxx 1.73 1.74

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv16696/Source/CTest

Modified Files:
	cmCTestBuildHandler.cxx cmCTestCoverageHandler.cxx 
Log Message:
Fix warnings in CMake source code. Suppress rampant warnings emanating from Qt files.


Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.73
retrieving revision 1.74
diff -C 2 -d -r1.73 -r1.74
*** cmCTestCoverageHandler.cxx	28 Sep 2009 15:42:58 -0000	1.73
--- cmCTestCoverageHandler.cxx	1 Oct 2009 20:47:08 -0000	1.74
***************
*** 1591,1595 ****
          this->CTest->GetShortPathToFile(file.c_str());
  
!       float cper = percentBranch + percentFunction;
        if(totalBranches > 0)
          {
--- 1591,1595 ----
          this->CTest->GetShortPathToFile(file.c_str());
  
!       float cper = static_cast<float>(percentBranch + percentFunction);
        if(totalBranches > 0)
          {
***************
*** 1597,1601 ****
          }
        percent_coverage += cper;
!       float cmet = percentFunction + percentBranch;
        if(totalBranches > 0)
          {
--- 1597,1601 ----
          }
        percent_coverage += cper;
!       float cmet = static_cast<float>(percentFunction + percentBranch);
        if(totalBranches > 0)
          {

Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.76
retrieving revision 1.77
diff -C 2 -d -r1.76 -r1.77
*** cmCTestBuildHandler.cxx	28 Sep 2009 15:42:57 -0000	1.76
--- cmCTestBuildHandler.cxx	1 Oct 2009 20:47:08 -0000	1.77
***************
*** 597,602 ****
  
    // only report the first 50 warnings and first 50 errors
!   unsigned short numErrorsAllowed = this->MaxErrors;
!   unsigned short numWarningsAllowed = this->MaxWarnings;
    std::string srcdir = this->CTest->GetCTestConfiguration("SourceDirectory");
    // make sure the source dir is in the correct case on windows
--- 597,602 ----
  
    // only report the first 50 warnings and first 50 errors
!   int numErrorsAllowed = this->MaxErrors;
!   int numWarningsAllowed = this->MaxWarnings;
    std::string srcdir = this->CTest->GetCTestConfiguration("SourceDirectory");
    // make sure the source dir is in the correct case on windows