Эх сурвалжийг харах

Use string::size_type instead of int for results of string.find() etc. -- patch from hans

xiaofeng@google.com 13 жил өмнө
parent
commit
3d46dad1d2

+ 1 - 1
src/google/protobuf/compiler/command_line_interface.cc

@@ -926,7 +926,7 @@ CommandLineInterface::InterpretArgument(const string& name,
       string virtual_path;
       string virtual_path;
       string disk_path;
       string disk_path;
 
 
-      int equals_pos = parts[i].find_first_of('=');
+      string::size_type equals_pos = parts[i].find_first_of('=');
       if (equals_pos == string::npos) {
       if (equals_pos == string::npos) {
         virtual_path = "";
         virtual_path = "";
         disk_path = parts[i];
         disk_path = parts[i];

+ 1 - 1
src/google/protobuf/descriptor.cc

@@ -2673,7 +2673,7 @@ Symbol DescriptorBuilder::LookupSymbolNoPlaceholder(
   //   }
   //   }
   // So, we look for just "Foo" first, then look for "Bar.baz" within it if
   // So, we look for just "Foo" first, then look for "Bar.baz" within it if
   // found.
   // found.
-  int name_dot_pos = name.find_first_of('.');
+  string::size_type name_dot_pos = name.find_first_of('.');
   string first_part_of_name;
   string first_part_of_name;
   if (name_dot_pos == string::npos) {
   if (name_dot_pos == string::npos) {
     first_part_of_name = name;
     first_part_of_name = name;