[cmake-commits] hoffman committed cmGlobalGenerator.cxx 1.210 1.211
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Nov 12 22:36:28 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv1690
Modified Files:
cmGlobalGenerator.cxx
Log Message:
ENH: add f stuff to avoid warnings
Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- cmGlobalGenerator.cxx 13 Nov 2007 03:33:00 -0000 1.210
+++ cmGlobalGenerator.cxx 13 Nov 2007 03:36:26 -0000 1.211
@@ -681,7 +681,7 @@
void cmGlobalGenerator::Configure()
{
- this->FirstTimeProgress = 0.0;
+ this->FirstTimeProgress = 0.0f;
// Delete any existing cmLocalGenerators
unsigned int i;
for (i = 0; i < this->LocalGenerators.size(); ++i)
@@ -908,7 +908,7 @@
// we are in the first time progress and we have no
// idea how long it will be. So, just move 1/10th of the way
// there each time, and don't go over 95%
- this->FirstTimeProgress += ((1.0 - this->FirstTimeProgress) /30.0);
+ this->FirstTimeProgress += ((1.0f - this->FirstTimeProgress) /30.0f);
if(this->FirstTimeProgress > 0.95f)
{
this->FirstTimeProgress = 0.95f;
@@ -1080,7 +1080,7 @@
// we are in the first time progress and we have no
// idea how long it will be. So, just move half way
// there each time, and don't go over 95%
- this->FirstTimeProgress += ((1.0 - this->FirstTimeProgress) /30.0);
+ this->FirstTimeProgress += ((1.0f - this->FirstTimeProgress) /30.0f);
if(this->FirstTimeProgress > 0.95f)
{
this->FirstTimeProgress = 0.95f;
More information about the Cmake-commits
mailing list