[Rprotobuf-commits] r668 - pkg/src

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

Author: murray
Date: 2013-12-31 09:04:55 +0100 (Tue, 31 Dec 2013)
New Revision: 668

Modified:
   pkg/src/wrapper_EnumDescriptor.cpp
   pkg/src/wrapper_EnumValueDescriptor.cpp
   pkg/src/wrapper_FileDescriptor.cpp
   pkg/src/wrapper_Message.cpp
Log:
Clean up 4 warnings caught by -Wall -pedantic.



Modified: pkg/src/wrapper_EnumDescriptor.cpp
===================================================================
--- pkg/src/wrapper_EnumDescriptor.cpp	2013-12-31 07:10:18 UTC (rev 667)
+++ pkg/src/wrapper_EnumDescriptor.cpp	2013-12-31 08:04:55 UTC (rev 668)
@@ -25,7 +25,7 @@
 #undef METHOD
 #define METHOD(__NAME__) RCPP_PP_CAT(EnumDescriptor__, __NAME__)
 
-RPB_XP_METHOD_0(METHOD(as_character), GPB::EnumDescriptor, DebugString);
+RPB_XP_METHOD_0(METHOD(as_character), GPB::EnumDescriptor, DebugString)
 RPB_XP_METHOD_0(METHOD(length), GPB::EnumDescriptor, value_count)
 RPB_XP_METHOD_0(METHOD(value_count), GPB::EnumDescriptor, value_count)
 

Modified: pkg/src/wrapper_EnumValueDescriptor.cpp
===================================================================
--- pkg/src/wrapper_EnumValueDescriptor.cpp	2013-12-31 07:10:18 UTC (rev 667)
+++ pkg/src/wrapper_EnumValueDescriptor.cpp	2013-12-31 08:04:55 UTC (rev 668)
@@ -25,7 +25,7 @@
 #undef METHOD
 #define METHOD(__NAME__) RCPP_PP_CAT(EnumValueDescriptor__, __NAME__)
 
-RPB_XP_METHOD_0(METHOD(as_character), GPB::EnumValueDescriptor, DebugString);
+RPB_XP_METHOD_0(METHOD(as_character), GPB::EnumValueDescriptor, DebugString)
 
 RPB_FUNCTION_1(S4_Message, METHOD(as_Message), Rcpp::XPtr<GPB::EnumValueDescriptor> d) {
     GPB::EnumValueDescriptorProto* message = new GPB::EnumValueDescriptorProto();

Modified: pkg/src/wrapper_FileDescriptor.cpp
===================================================================
--- pkg/src/wrapper_FileDescriptor.cpp	2013-12-31 07:10:18 UTC (rev 667)
+++ pkg/src/wrapper_FileDescriptor.cpp	2013-12-31 08:04:55 UTC (rev 668)
@@ -6,7 +6,7 @@
 #undef METHOD
 #define METHOD(__NAME__) RCPP_PP_CAT(FileDescriptor__, __NAME__)
 
-RPB_XP_METHOD_0(METHOD(as_character), GPB::FileDescriptor, DebugString);
+RPB_XP_METHOD_0(METHOD(as_character), GPB::FileDescriptor, DebugString)
 
 RPB_FUNCTION_1(S4_Message, METHOD(as_Message), Rcpp::XPtr<GPB::FileDescriptor> d) {
     GPB::FileDescriptorProto* message = new GPB::FileDescriptorProto();

Modified: pkg/src/wrapper_Message.cpp
===================================================================
--- pkg/src/wrapper_Message.cpp	2013-12-31 07:10:18 UTC (rev 667)
+++ pkg/src/wrapper_Message.cpp	2013-12-31 08:04:55 UTC (rev 668)
@@ -231,7 +231,7 @@
     int nexts = 0;
     vector<const FieldDescriptor*> fields;
     ref->ListFields(*message, &fields);
-    for (int i = 0; i < fields.size(); i++) {
+    for (unsigned int i = 0; i < fields.size(); i++) {
         if (fields[i]->is_extension()) {
             nexts++;
         }