[cmake-commits] king committed cmCPackDebGenerator.cxx 1.17 1.18 cmCPackNSISGenerator.cxx 1.27 1.28 cmCPackPackageMakerGenerator.cxx 1.20 1.21 cmCPackPackageMakerGenerator.h 1.9 1.10

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackDebGenerator.cxx cmCPackNSISGenerator.cxx 
	cmCPackPackageMakerGenerator.cxx 
	cmCPackPackageMakerGenerator.h 
Log Message:
COMP: Fix warnings on 64-bit Mac OS X build.  Patch from issue #3697.


Index: cmCPackPackageMakerGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackPackageMakerGenerator.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cmCPackPackageMakerGenerator.cxx	31 Oct 2007 12:50:17 -0000	1.20
+++ cmCPackPackageMakerGenerator.cxx	5 Nov 2007 19:34:36 -0000	1.21
@@ -30,7 +30,7 @@
 //----------------------------------------------------------------------
 cmCPackPackageMakerGenerator::cmCPackPackageMakerGenerator()
 {
-  this->PackageMakerVersion = 0;
+  this->PackageMakerVersion = 0.0;
 }
 
 //----------------------------------------------------------------------
@@ -196,7 +196,7 @@
     return 0;
     }
   this->PackageMakerVersion = atof(rexVersion.match(1).c_str());
-  if ( this->PackageMakerVersion < 1 )
+  if ( this->PackageMakerVersion < 1.0 )
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR, "Require PackageMaker 1.0 or higher"
       << std::endl);

Index: cmCPackNSISGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackNSISGenerator.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmCPackNSISGenerator.cxx	31 Oct 2007 13:03:40 -0000	1.27
+++ cmCPackNSISGenerator.cxx	5 Nov 2007 19:34:36 -0000	1.28
@@ -216,8 +216,8 @@
       << "Please check " << tmpFile.c_str() << " for errors" << std::endl);
     return 0;
     }
-  float nsisVersion = atof(versionRex.match(1).c_str());
-  float minNSISVersion = 2.09;
+  double nsisVersion = atof(versionRex.match(1).c_str());
+  double minNSISVersion = 2.09;
   cmCPackLogger(cmCPackLog::LOG_DEBUG, "NSIS Version: "
     << nsisVersion << std::endl);
   if ( nsisVersion < minNSISVersion )

Index: cmCPackDebGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackDebGenerator.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cmCPackDebGenerator.cxx	31 Oct 2007 12:50:17 -0000	1.17
+++ cmCPackDebGenerator.cxx	5 Nov 2007 19:34:36 -0000	1.18
@@ -338,7 +338,7 @@
 {
   static char pad = '\n';
   off_t sz = size;
-  int nr, nw;
+  size_t nr, nw;
   char buf[8*1024];
 
   if (sz == 0)
@@ -347,11 +347,11 @@
   FILE* from = cfp->rFile;
   FILE* to = cfp->wFile;
   while (sz && 
-        (nr = fread(buf, 1, sz < off_t(sizeof(buf)) ? sz : sizeof(buf), from ))
+        (nr = fread(buf, 1, sz < static_cast<off_t>(sizeof(buf)) ? static_cast<size_t>(sz) : sizeof(buf), from ))
                > 0) {
     sz -= nr;
-    for (int off = 0; off < nr; nr -= off, off += nw)
-      if ((nw = fwrite(buf + off, 1, nr, to)) < 0)
+    for (size_t off = 0; off < nr; nr -= off, off += nw)
+      if ((nw = fwrite(buf + off, 1, nr, to)) < nr)
         return -1;
     }
   if (sz)
@@ -424,7 +424,7 @@
   FILE* aFile = fopen(archive, "wb+");
   if (aFile!=NULL) {
     fwrite(ARMAG, SARMAG, 1, aFile);
-    if (fseek(aFile, (off_t)0, SEEK_END) != (off_t)-1) {
+    if (fseek(aFile, 0, SEEK_END) != -1) {
       CF cf;
       struct stat sb;
       /* Read from disk, write to an archive; pad on write. */

Index: cmCPackPackageMakerGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackPackageMakerGenerator.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cmCPackPackageMakerGenerator.h	31 Oct 2007 12:50:17 -0000	1.9
+++ cmCPackPackageMakerGenerator.h	5 Nov 2007 19:34:36 -0000	1.10
@@ -48,7 +48,7 @@
   bool CopyCreateResourceFile(const char* name);
   bool CopyResourcePlistFile(const char* name);
 
-  float PackageMakerVersion;
+  double PackageMakerVersion;
 };
 
 #endif