[Rprotobuf-commits] r366 - in pkg: R inst src

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

Author: romain
Date: 2010-07-30 11:04:39 +0200 (Fri, 30 Jul 2010)
New Revision: 366

Modified:
   pkg/R/add.R
   pkg/R/clear.R
   pkg/R/swap.R
   pkg/inst/ChangeLog
   pkg/src/rprotobuf.cpp
Log:
now we can Sweave

Modified: pkg/R/add.R
===================================================================
--- pkg/R/add.R	2010-07-30 08:56:17 UTC (rev 365)
+++ pkg/R/add.R	2010-07-30 09:04:39 UTC (rev 366)
@@ -8,7 +8,7 @@
 		values <- list( values )
 	}
 	
-	.Call( "message_add_values", object at pointer, field, values, PACKAGE = "RProtoBuf" )
+	.Call( "Message__add_values", object at pointer, field, values, PACKAGE = "RProtoBuf" )
 	invisible( object )
 } )
 

Modified: pkg/R/clear.R
===================================================================
--- pkg/R/clear.R	2010-07-30 08:56:17 UTC (rev 365)
+++ pkg/R/clear.R	2010-07-30 09:04:39 UTC (rev 366)
@@ -7,22 +7,22 @@
 } )
 
 setMethod( "clear", signature( "Message", "character" ), function(object, field, ...){
-	.Call( "clear_message_field", object at pointer, field, PACKAGE = "RProtoBuf" )
+	.Call( "Message__clear_field", object at pointer, field, PACKAGE = "RProtoBuf" )
 	invisible( object )
 } )
 
 setMethod( "clear", signature( "Message", "integer" ), function(object, field, ...){
-	.Call( "clear_message_field", object at pointer, field, PACKAGE = "RProtoBuf" )
+	.Call( "Message__clear_field", object at pointer, field, PACKAGE = "RProtoBuf" )
 	invisible( object )
 } )
 
 setMethod( "clear", signature( "Message", "numeric" ), function(object, field, ...){
-	.Call( "clear_message_field", object at pointer, as.integer(field), PACKAGE = "RProtoBuf" )
+	.Call( "Message__clear_field", object at pointer, as.integer(field), PACKAGE = "RProtoBuf" )
 	invisible( object )
 } )
 
 setMethod( "clear", signature( "Message", "raw" ), function(object, field, ...){
-	.Call( "clear_message_field", object at pointer, as.integer(field), PACKAGE = "RProtoBuf" )
+	.Call( "Message__clear_field", object at pointer, as.integer(field), PACKAGE = "RProtoBuf" )
 	invisible( object )
 } )
 

Modified: pkg/R/swap.R
===================================================================
--- pkg/R/swap.R	2010-07-30 08:56:17 UTC (rev 365)
+++ pkg/R/swap.R	2010-07-30 09:04:39 UTC (rev 366)
@@ -8,7 +8,7 @@
 	if( length(left) != length(right) ){
 		stop( "left and right should have the same length" )
 	}
-	.Call( "Message__swap_fields", object at pointer, field, left, right, 
+	.Call( "Message__swap", object at pointer, field, left, right, 
 		PACKAGE = "RProtoBuf" ) 
 	invisible( object )
 } )

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-07-30 08:56:17 UTC (rev 365)
+++ pkg/inst/ChangeLog	2010-07-30 09:04:39 UTC (rev 366)
@@ -1,3 +1,7 @@
+2010-07-30  Romain Francois <romain at r-enthusiasts.com>
+
+	* src/* : correct many small errors so that the vignette builds again 
+
 2010-02-02  Dirk Eddelbuettel  <edd at debian.org>
 
 	* configure.in: More rigorous checks for ProtoBuf headers, library,

Modified: pkg/src/rprotobuf.cpp
===================================================================
--- pkg/src/rprotobuf.cpp	2010-07-30 08:56:17 UTC (rev 365)
+++ pkg/src/rprotobuf.cpp	2010-07-30 09:04:39 UTC (rev 366)
@@ -200,14 +200,10 @@
 				field_desc = (GPB::FieldDescriptor*)desc->FindFieldByName( CHAR( STRING_ELT(name, 0 ) ) ) ;
 				break ;
 			}
-		case REALSXP: 
-			{
-				field_desc = (GPB::FieldDescriptor*)desc->FindFieldByNumber( static_cast<int>( REAL(name)[0] ) ) ;
-				break ;
-			}
+		case REALSXP:
 		case INTSXP:
 			{
-				field_desc = (GPB::FieldDescriptor*)desc->FindFieldByNumber( INTEGER(name)[0] ) ;
+				field_desc = (GPB::FieldDescriptor*)desc->FindFieldByNumber( Rcpp::as<int>( name ) ) ;
 				break ;
 			}
 	}