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

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

Author: edd
Date: 2012-08-09 03:07:14 +0200 (Thu, 09 Aug 2012)
New Revision: 454

Added:
   pkg/vignettes/
Modified:
   pkg/ChangeLog
   pkg/DESCRIPTION
   pkg/src/mutators.cpp
Log:
vignettes directory added

Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2012-05-15 19:44:24 UTC (rev 453)
+++ pkg/ChangeLog	2012-08-09 01:07:14 UTC (rev 454)
@@ -1,3 +1,16 @@
+2012-08-08  Dirk Eddelbuettel  <edd at debian.org>
+
+ 	* DESCRIPTION: Release 0.2.5
+
+	* src/mutators.cpp: Applied patch by Murray to correctly deal with
+	nested protocol buffer definitions
+	* inst/unitTests/runit.nested.R: Added test from Murray
+	* inst/unitTests/data/nested.proto: Nested protbuf def from Murray
+
+	* inst/NEWS.Rd: Converted NEWS file to .Rd format
+
+	* DESCRIPTION: changed Maintainer: to single person per CRAN Policy
+	
 2012-05-15  Dirk Eddelbuettel  <edd at debian.org>
 
  	* DESCRIPTION: Release 0.2.4

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-05-15 19:44:24 UTC (rev 453)
+++ pkg/DESCRIPTION	2012-08-09 01:07:14 UTC (rev 454)
@@ -1,8 +1,8 @@
 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>
+Maintainer: Dirk Eddelbuettel <edd at debian.org>
 Title: R Interface to the Protocol Buffers API
 Description: Protocol Buffers are a way of encoding structured data in an
  efficient yet extensible format. Google uses Protocol Buffers for almost all

Modified: pkg/src/mutators.cpp
===================================================================
--- pkg/src/mutators.cpp	2012-05-15 19:44:24 UTC (rev 453)
+++ pkg/src/mutators.cpp	2012-08-09 01:07:14 UTC (rev 454)
@@ -367,7 +367,7 @@
 	
 	const Reflection * ref = message->GetReflection() ;
     
-	if( value == R_NilValue || LENGTH(value) == 0 ){
+	if( value == R_NilValue || (Rf_isVector(value) && LENGTH(value) == 0 )) {
 		ref->ClearField( message, field_desc ); 
 		return R_NilValue ;
 	}