[Rcpp-commits] r3688 - pkg/RcppCNPy/src

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

Author: edd
Date: 2012-07-11 03:32:29 +0200 (Wed, 11 Jul 2012)
New Revision: 3688

Modified:
   pkg/RcppCNPy/src/cnpy.cpp
Log:
 o condition on RCPP_HAS_LONG_LONG rather than commenting out


Modified: pkg/RcppCNPy/src/cnpy.cpp
===================================================================
--- pkg/RcppCNPy/src/cnpy.cpp	2012-07-10 22:04:14 UTC (rev 3687)
+++ pkg/RcppCNPy/src/cnpy.cpp	2012-07-11 01:32:29 UTC (rev 3688)
@@ -25,12 +25,16 @@
     if(t == typeid(char) ) return 'i';
     if(t == typeid(short) ) return 'i';
     if(t == typeid(long) ) return 'i';
-    //if(t == typeid(long long) ) return 'i';
+#ifdef RCPP_HAS_LONG_LONG_TYPES
+    if(t == typeid(long long) ) return 'i';
+#endif
 
     if(t == typeid(unsigned char) ) return 'u';
     if(t == typeid(unsigned short) ) return 'u';
     if(t == typeid(unsigned long) ) return 'u';
-    //if(t == typeid(unsigned long long) ) return 'u';
+#ifdef RCPP_HAS_LONG_LONG_TYPES
+    if(t == typeid(unsigned long long) ) return 'u';
+#endif
     if(t == typeid(unsigned int) ) return 'u';
 
     if(t == typeid(bool) ) return 'b';