[Rprotobuf-commits] r426 - in pkg: . src

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

Author: romain
Date: 2011-11-07 09:52:36 +0100 (Mon, 07 Nov 2011)
New Revision: 426

Modified:
   pkg/DESCRIPTION
   pkg/src/extractors.cpp
   pkg/src/mutators.cpp
   pkg/src/wrapper_FieldDescriptor.cpp
Log:
removed some #ifdefs

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2011-07-17 22:54:26 UTC (rev 425)
+++ pkg/DESCRIPTION	2011-11-07 08:52:36 UTC (rev 426)
@@ -1,5 +1,5 @@
 Package: RProtoBuf
-Version: 0.2.4
+Version: 0.2.4.1
 Date: $Date$
 Author: Romain Francois <romain at r-enthusiasts.com> and Dirk Eddelbuettel <edd at debian.org>
 Maintainer: Romain and Dirk <RomainAndDirk at r-enthusiasts.com>
@@ -7,7 +7,7 @@
 Description: Protocol Buffers are a way of encoding structured data in an
  efficient yet extensible format. Google uses Protocol Buffers for almost all
  of its internal RPC protocols and file formats.  
-Depends: R (>= 2.11.0), RCurl, Rcpp (>= 0.8.6), methods
+Depends: R (>= 2.11.0), RCurl, Rcpp (>= 0.9.7), int64, methods
 LinkingTo: Rcpp
 Suggests: RUnit, highlight
 SystemRequirements: Protocol Buffer compiler (to create C++ header and source files

Modified: pkg/src/extractors.cpp
===================================================================
--- pkg/src/extractors.cpp	2011-07-17 22:54:26 UTC (rev 425)
+++ pkg/src/extractors.cpp	2011-11-07 08:52:36 UTC (rev 426)
@@ -73,10 +73,8 @@
 
 			HANDLE_REPEATED_FIELD(CPPTYPE_INT32, GPB::int32) ;
     		HANDLE_REPEATED_FIELD(CPPTYPE_UINT32, GPB::uint32) ;
-#ifdef RCPP_HAS_LONG_LONG_TYPES
     		HANDLE_REPEATED_FIELD(CPPTYPE_INT64, GPB::int64) ;
     		HANDLE_REPEATED_FIELD(CPPTYPE_UINT64, GPB::uint64) ;
-#endif
     		HANDLE_REPEATED_FIELD(CPPTYPE_DOUBLE, double) ;
     		HANDLE_REPEATED_FIELD(CPPTYPE_FLOAT, float) ;
     		HANDLE_REPEATED_FIELD(CPPTYPE_BOOL, bool) ;
@@ -114,10 +112,8 @@
 
 		HANDLE_SINGLE_FIELD( CPPTYPE_INT32,  Int32 ); 
 		HANDLE_SINGLE_FIELD( CPPTYPE_UINT32, UInt32 ); 
-#ifdef RCPP_HAS_LONG_LONG_TYPES
 		HANDLE_SINGLE_FIELD( CPPTYPE_INT64,  Int64 );
 		HANDLE_SINGLE_FIELD( CPPTYPE_UINT64, UInt64 );
-#endif
 		HANDLE_SINGLE_FIELD( CPPTYPE_DOUBLE, Double );
 		HANDLE_SINGLE_FIELD( CPPTYPE_FLOAT, Float );
 		HANDLE_SINGLE_FIELD( CPPTYPE_BOOL, Bool );

Modified: pkg/src/mutators.cpp
===================================================================
--- pkg/src/mutators.cpp	2011-07-17 22:54:26 UTC (rev 425)
+++ pkg/src/mutators.cpp	2011-11-07 08:52:36 UTC (rev 426)
@@ -992,10 +992,8 @@
 
 			HANDLE_SINGLE_FIELD( CPPTYPE_INT32, Int32, GPB::int32) ;
 			HANDLE_SINGLE_FIELD( CPPTYPE_UINT32, UInt32, GPB::uint32) ;
-#ifdef RCPP_HAS_LONG_LONG_TYPES
 			HANDLE_SINGLE_FIELD( CPPTYPE_INT64, Int64, GPB::int64) ;
 			HANDLE_SINGLE_FIELD( CPPTYPE_UINT64, UInt64, GPB::uint64) ;
-#endif
 			HANDLE_SINGLE_FIELD( CPPTYPE_DOUBLE, Double, double) ;
 			HANDLE_SINGLE_FIELD( CPPTYPE_FLOAT, Float, float) ;
 			HANDLE_SINGLE_FIELD( CPPTYPE_BOOL, Bool, bool) ;

Modified: pkg/src/wrapper_FieldDescriptor.cpp
===================================================================
--- pkg/src/wrapper_FieldDescriptor.cpp	2011-07-17 22:54:26 UTC (rev 425)
+++ pkg/src/wrapper_FieldDescriptor.cpp	2011-11-07 08:52:36 UTC (rev 426)
@@ -53,10 +53,8 @@
 			
 			RPB_HANDLE_CASE(INT32,int32)
 			RPB_HANDLE_CASE(UINT32,uint32)
-#ifdef RCPP_HAS_LONG_LONG_TYPES
 			RPB_HANDLE_CASE(INT64,int64)
 			RPB_HANDLE_CASE(UINT64,uint64)
-#endif
 			RPB_HANDLE_CASE(DOUBLE,double)
 			RPB_HANDLE_CASE(FLOAT,float)
 			RPB_HANDLE_CASE(BOOL,bool)