[Cmake-commits] [cmake-commits] king committed cmSystemTools.cxx 1.390 1.391

[cmake-commits at cmake.org]

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

Modified Files:
	cmSystemTools.cxx 
Log Message:
COMP: Fix BOOL to bool conversion warning

The cmSystemTools::RenameFile method returns type bool, but its
implementation on Windows returns the result of an API function that
returns BOOL.  This change avoids the compiler warning.


Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.390
retrieving revision 1.391
diff -C 2 -d -r1.390 -r1.391
*** cmSystemTools.cxx	15 Apr 2009 13:57:57 -0000	1.390
--- cmSystemTools.cxx	15 Apr 2009 15:00:03 -0000	1.391
***************
*** 1140,1149 ****
           destination and then move the file.  */
        DeleteFile(newname);
!       return MoveFile(oldname, newname);
        }
      else
        {
        /* This is not Win9x.  Use the MoveFileEx implementation.  */
!       return MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING);
        }
      }
--- 1140,1149 ----
           destination and then move the file.  */
        DeleteFile(newname);
!       return MoveFile(oldname, newname) != 0;
        }
      else
        {
        /* This is not Win9x.  Use the MoveFileEx implementation.  */
!       return MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) != 0;
        }
      }
***************
*** 1151,1155 ****
      {
      /* The destination does not exist.  Just move the file.  */
!     return MoveFile(oldname, newname);
      }
  #else
--- 1151,1155 ----
      {
      /* The destination does not exist.  Just move the file.  */
!     return MoveFile(oldname, newname) != 0;
      }
  #else