[Rcpp-commits] r4276 - in pkg/Rcpp: . inst inst/include/Rcpp/platform

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

Author: edd
Date: 2013-03-01 21:29:25 +0100 (Fri, 01 Mar 2013)
New Revision: 4276

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/THANKS
   pkg/Rcpp/inst/include/Rcpp/platform/compiler.h
Log:
improved compile-time test for long long (using __LONG_LONG_MAX__ from limits.h)


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-03-01 14:22:44 UTC (rev 4275)
+++ pkg/Rcpp/ChangeLog	2013-03-01 20:29:25 UTC (rev 4276)
@@ -15,6 +15,12 @@
         * src/attributes.cpp: handle Rcpp module definitions in sourceCpp
         * man/sourceCpp.Rd: documentation updates
 
+2013-02-20  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/include/Rcpp/platform/compiler.h: As deteced by Gong-Yi Liao,
+	we need to test for __LONG_LONG_MAX__ (defined in limits.h) and not
+	LONG_LONG_MAX (defined climits which we do not include)
+
 2013-02-19 Romain Francois <romain at r-enthusiasts.com>
 
         * src/api.cpp : more debugging

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2013-03-01 14:22:44 UTC (rev 4275)
+++ pkg/Rcpp/DESCRIPTION	2013-03-01 20:29:25 UTC (rev 4276)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.10.2.4
+Version: 0.10.2.5
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Douglas Bates, John Chambers and JJ Allaire

Modified: pkg/Rcpp/inst/THANKS
===================================================================
--- pkg/Rcpp/inst/THANKS	2013-03-01 14:22:44 UTC (rev 4275)
+++ pkg/Rcpp/inst/THANKS	2013-03-01 20:29:25 UTC (rev 4276)
@@ -10,6 +10,7 @@
 Rainer Hurling          for help debugging builds issues on FreeBSD
 Gregor Kastner          for noticing a bug in IntegerVector initialization
 Glenn Lawyer		for sending in documentation patches
+Gong-Yi Liao		for a corrected compile-time test for long long variables
 Uwe Ligges              for help with Windows (32 and 64 bit) build issues
 Tama Ma                 for a patch that extends Module constructors
 Karl Millar             for a patch helping with a non-g++ compiler

Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h	2013-03-01 14:22:44 UTC (rev 4275)
+++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h	2013-03-01 20:29:25 UTC (rev 4276)
@@ -183,7 +183,7 @@
 
 #ifdef __GNUC__
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
-#ifdef LONG_LONG_MAX
+#ifdef __LONG_LONG_MAX__
     __extension__ typedef long long int rcpp_long_long_type;
     __extension__ typedef unsigned long long int rcpp_ulong_long_type;
     #define RCPP_HAS_LONG_LONG_TYPES