diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-01 08:54:12 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-01 08:54:12 +0000 |
| commit | 982b26d1eb7925a47e97a07877d7d7a89116955e (patch) | |
| tree | b31446c41ddf438fd605dcea4df622f8489e0ccf /third_party/protobuf/src | |
| parent | 4e725b84271e969bda7459457a138cad1bef4de8 (diff) | |
| download | chromium_src-982b26d1eb7925a47e97a07877d7d7a89116955e.zip chromium_src-982b26d1eb7925a47e97a07877d7d7a89116955e.tar.gz chromium_src-982b26d1eb7925a47e97a07877d7d7a89116955e.tar.bz2 | |
Protobuf: Cherry-pick upstream r427.
Use string::size_type instead of int for results of
string::find_first_of().
BUG=151927
Review URL: https://codereview.chromium.org/11012009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159466 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf/src')
| -rw-r--r-- | third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc | 2 | ||||
| -rw-r--r-- | third_party/protobuf/src/google/protobuf/descriptor.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc b/third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc index 1c76994..060a612 100644 --- a/third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc +++ b/third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc @@ -890,7 +890,7 @@ bool CommandLineInterface::InterpretArgument(const string& name, string virtual_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) { virtual_path = ""; disk_path = parts[i]; diff --git a/third_party/protobuf/src/google/protobuf/descriptor.cc b/third_party/protobuf/src/google/protobuf/descriptor.cc index 58c7aa1..5bdd565 100644 --- a/third_party/protobuf/src/google/protobuf/descriptor.cc +++ b/third_party/protobuf/src/google/protobuf/descriptor.cc @@ -2356,7 +2356,7 @@ Symbol DescriptorBuilder::LookupSymbolNoPlaceholder( // } // So, we look for just "Foo" first, then look for "Bar.baz" within it if // found. - int name_dot_pos = name.find_first_of('.'); + string::size_type name_dot_pos = name.find_first_of('.'); string first_part_of_name; if (name_dot_pos == string::npos) { first_part_of_name = name; |