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

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

Author: murray
Date: 2013-12-27 09:36:02 +0100 (Fri, 27 Dec 2013)
New Revision: 605

Modified:
   pkg/ChangeLog
   pkg/src/mutators.cpp
Log:
Make field_desc const and update email address.



Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2013-12-27 08:27:34 UTC (rev 604)
+++ pkg/ChangeLog	2013-12-27 08:36:02 UTC (rev 605)
@@ -1,4 +1,4 @@
-2013-12-27  Murray Stokely  <murray at hilbert.local>
+2013-12-27  Murray Stokely  <mstokely at google.com>
 
 	* src/mutators.cpp: Refactor setMessageField into four separate
 	  functions, correct a few minor typos, and wrap everything in a

Modified: pkg/src/mutators.cpp
===================================================================
--- pkg/src/mutators.cpp	2013-12-27 08:27:34 UTC (rev 604)
+++ pkg/src/mutators.cpp	2013-12-27 08:36:02 UTC (rev 605)
@@ -387,7 +387,7 @@
  * otherwise this could lead to modifying a few values then failing in
  * an inconsistent state.
  */
-void CHECK_repeated_vals(GPB::FieldDescriptor* field_desc,
+void CHECK_repeated_vals(const GPB::FieldDescriptor* field_desc,
 						 SEXP value, int value_size) {
 	switch( field_desc->type() ){
 	case TYPE_MESSAGE:
@@ -530,7 +530,7 @@
  */
 void setNonRepeatedMessageField(GPB::Message* message,
 								const Reflection* ref,
-								GPB::FieldDescriptor* field_desc,
+								const GPB::FieldDescriptor* field_desc,
 								SEXP value, int value_size) {
 	if (value_size > 1) {
 		throwException( "cannot set non-repeated field to vector of length > 1",
@@ -748,7 +748,7 @@
 
 void setRepeatedMessageField(GPB::Message* message,
 							 const Reflection* ref,
-							 GPB::FieldDescriptor* field_desc,
+							 const GPB::FieldDescriptor* field_desc,
 							 SEXP value, int value_size) {
 	// The number of elements already in the repeated field.
 	int field_size = ref->FieldSize( *message, field_desc ) ;
@@ -1255,7 +1255,7 @@
 	GPB::Message* message = GET_MESSAGE_POINTER_FROM_XP(pointer) ;
 
 	/* check that we can get a file descriptor from name */
-	GPB::FieldDescriptor* field_desc = getFieldDescriptor( message, name ); 
+	const GPB::FieldDescriptor* field_desc = getFieldDescriptor( message, name ); 
 	
 	const Reflection * ref = message->GetReflection() ;