[Cmake-commits] [cmake-commits] david.cole committed cmCTestMultiProcessHandler.cxx 1.27 1.28 cmCTestTestHandler.cxx 1.121 1.122

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestMultiProcessHandler.cxx cmCTestTestHandler.cxx 
Log Message:
Fix warnings in CMake source code.


Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** cmCTestMultiProcessHandler.cxx	28 Sep 2009 15:43:01 -0000	1.27
--- cmCTestMultiProcessHandler.cxx	2 Oct 2009 19:30:01 -0000	1.28
***************
*** 252,256 ****
      this->RunningTests.erase(p);
      this->WriteCheckpoint(test);
!     this->WriteCostData(test, p->GetTestResults().ExecutionTime);
      this->RunningCount -= GetProcessorsUsed(test);
      delete p;
--- 252,257 ----
      this->RunningTests.erase(p);
      this->WriteCheckpoint(test);
!     this->WriteCostData(test, static_cast<float>(
!       p->GetTestResults().ExecutionTime));
      this->RunningCount -= GetProcessorsUsed(test);
      delete p;
***************
*** 277,281 ****
  
        int index = atoi(parts[0].c_str());
!       float cost = atof(parts[1].c_str());
        if(this->Properties[index] && this->Properties[index]->Cost == 0)
          {
--- 278,282 ----
  
        int index = atoi(parts[0].c_str());
!       float cost = static_cast<float>(atof(parts[1].c_str()));
        if(this->Properties[index] && this->Properties[index]->Cost == 0)
          {

Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.121
retrieving revision 1.122
diff -C 2 -d -r1.121 -r1.122
*** cmCTestTestHandler.cxx	28 Sep 2009 15:43:02 -0000	1.121
--- cmCTestTestHandler.cxx	2 Oct 2009 19:30:01 -0000	1.122
***************
*** 575,588 ****
        }
  
!     float percent = float(passed.size()) * 100.0f / total;
      if ( failed.size() > 0 &&  percent > 99)
        {
        percent = 99;
        }
!     
      cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl
                 << static_cast<int>(percent + .5) << "% tests passed, "
!                << failed.size() << " tests failed out of " 
!                << total << std::endl); 
      if(this->CTest->GetLabelSummary())
        {
--- 575,588 ----
        }
  
!     float percent = float(passed.size()) * 100.0f / float(total);
      if ( failed.size() > 0 &&  percent > 99)
        {
        percent = 99;
        }
! 
      cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl
                 << static_cast<int>(percent + .5) << "% tests passed, "
!                << failed.size() << " tests failed out of "
!                << total << std::endl);
      if(this->CTest->GetLabelSummary())
        {
***************
*** 1983,1987 ****
            if ( key == "COST" )
              {
!             rtit->Cost = atof(val.c_str());
              }
            if ( key == "RUN_SERIAL" )
--- 1983,1987 ----
            if ( key == "COST" )
              {
!             rtit->Cost = static_cast<float>(atof(val.c_str()));
              }
            if ( key == "RUN_SERIAL" )