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

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

Author: edd
Date: 2012-05-14 22:52:11 +0200 (Mon, 14 May 2012)
New Revision: 448

Modified:
   pkg/DESCRIPTION
   pkg/cleanup
   pkg/src/streams.cpp
   pkg/src/wrapper_FieldDescriptor.cpp
Log:
streams does not need an #ifdef for int64 as we generally won't have int64
restore an older test for 'long long' in wrapper_FieldDescriptor though
roll minor version 
also remove src/symbols.rds in cleanup


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-05-14 20:42:59 UTC (rev 447)
+++ pkg/DESCRIPTION	2012-05-14 20:52:11 UTC (rev 448)
@@ -1,5 +1,5 @@
 Package: RProtoBuf
-Version: 0.2.3.2
+Version: 0.2.3.3
 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>

Modified: pkg/cleanup
===================================================================
--- pkg/cleanup	2012-05-14 20:42:59 UTC (rev 447)
+++ pkg/cleanup	2012-05-14 20:52:11 UTC (rev 448)
@@ -4,6 +4,7 @@
     src/addressbook.pb.cc src/addressbook.pb.h \
     src/protobufrpc.pb.cc src/protobufrpc.pb.h \
     src/*.o src/*.d src/*.a src/*.dll src/*.so src/*.rc */*~ *~ \
+    src/symbols.rds \
     inst/doc/RProtoBuf*.aux inst/doc/RProtoBuf*.log \
     inst/doc/RProtoBuf*.out inst/doc/RProtoBuf*.tex \
     inst/doc/RProtoBuf*.toc 

Modified: pkg/src/streams.cpp
===================================================================
--- pkg/src/streams.cpp	2012-05-14 20:42:59 UTC (rev 447)
+++ pkg/src/streams.cpp	2012-05-14 20:52:11 UTC (rev 448)
@@ -189,7 +189,6 @@
 		return Rf_ScalarInteger( res ) ;
 	}
 	
-#ifdef RCPP_HAS_INT64
 	SEXP ZeroCopyInputStream_ReadLittleEndian64( SEXP xp){
 		GPB::io::CodedInputStream* coded_stream = GET_CIS(xp) ;
 		uint64 res = 0 ;
@@ -203,7 +202,6 @@
 		if( !coded_stream->ReadVarint64( &res ) ) Rf_error( "error reading varint64" ) ;
 		return Rf_ScalarReal( (double)res ) ;
 	}
-#endif
 	// }}}
 	
 	// {{{ Write*** functions using CodedOuputStream

Modified: pkg/src/wrapper_FieldDescriptor.cpp
===================================================================
--- pkg/src/wrapper_FieldDescriptor.cpp	2012-05-14 20:42:59 UTC (rev 447)
+++ pkg/src/wrapper_FieldDescriptor.cpp	2012-05-14 20:52:11 UTC (rev 448)
@@ -53,8 +53,10 @@
 			
 			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)