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

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

Author: edd
Date: 2013-09-14 22:24:06 +0200 (Sat, 14 Sep 2013)
New Revision: 4485

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/platform/compiler.h
Log:
Further refine #if test for 'long long' by conditioning __LP64__ on also using clang/llvm


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-09-14 12:27:14 UTC (rev 4484)
+++ pkg/Rcpp/ChangeLog	2013-09-14 20:24:06 UTC (rev 4485)
@@ -1,5 +1,8 @@
 2013-09-14  Dirk Eddelbuettel  <edd at debian.org>
 
+	* inst/include/Rcpp/platform/compiler.h: Further refine #if test for
+	'long long' by conditioning __LP64__ on also using clang/llvm
+
 	* src/attributes.cpp (Rcpp): Precede closing '>' by space to avoid '>>'
 
 2013-09-13  Romain Francois <romain at r-enthusiasts.com>

Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h	2013-09-14 12:27:14 UTC (rev 4484)
+++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h	2013-09-14 20:24:06 UTC (rev 4485)
@@ -178,7 +178,7 @@
 #endif
 
 #ifdef __GNUC__
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__LP64__)
+#if defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined (__clang__) && defined(__LP64__))
 #ifdef __LONG_LONG_MAX__
     __extension__ typedef long long int rcpp_long_long_type;
     __extension__ typedef unsigned long long int rcpp_ulong_long_type;