[Genabel-commits] r1937 - in pkg/DatABEL: . src/DAlib

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2015-03-30 17:37:47 +0200 (Mon, 30 Mar 2015)
New Revision: 1937

Modified:
   pkg/DatABEL/ChangeLog
   pkg/DatABEL/src/DAlib/AbstractMatrix_R.cpp
Log:
Fixed DatABEL bug #2174 "windows 7 64bit gives warning it is a 32 bit system". Instead of testing for the size of an unsigned long, test for the size of a void pointer as suggested in this StackOverflow answer: http://stackoverflow.com/a/1505614/881084.
I tested this on Windows 8.1 with R 3.1.3. When running the R i386 binary the messages appears, when running the x86 binary it doesn't.

NOTE: I didn't check any logic in the code, but apart from printing this error message, nothing seems to be done with this check. Note that bug #5522 (DatABEL files > 4GB on windows are problematic) still stands and is probably the actual thing that a user will run into.


Modified: pkg/DatABEL/ChangeLog
===================================================================
--- pkg/DatABEL/ChangeLog	2015-03-30 11:26:54 UTC (rev 1936)
+++ pkg/DatABEL/ChangeLog	2015-03-30 15:37:47 UTC (rev 1937)
@@ -6,6 +6,7 @@
   was complaining about.
 - Converted inst/unitTests/Makefile to Unix format (LF line endings)
   because R CMD check gave a warning about the CR or CRLF line endings.
+- Fixed bug #2174: "windows 7 64bit gives warning it is a 32 bit system".
 
 **** v. 0.9-5 (2014.01.05)
 

Modified: pkg/DatABEL/src/DAlib/AbstractMatrix_R.cpp
===================================================================
--- pkg/DatABEL/src/DAlib/AbstractMatrix_R.cpp	2015-03-30 11:26:54 UTC (rev 1936)
+++ pkg/DatABEL/src/DAlib/AbstractMatrix_R.cpp	2015-03-30 15:37:47 UTC (rev 1937)
@@ -602,8 +602,10 @@
 	}
 
 	SEXP checkNumBits(){
-	    if (sizeof(unsigned long) != 8) {
-    		errorLog << "YOU APPEAR TO WORK ON 32-BIT SYSTEM. LARGE FILES ARE NOT SUPPORTED."<<endl;
+	    if (sizeof(void*) != 8) {
+    		errorLog << 
+		  "YOU APPEAR TO WORK ON A 32-BIT SYSTEM. " << 
+		  "LARGE FILES ARE NOT SUPPORTED." << endl;
     	}
 	    return R_NilValue;
 	}