diff options
| author | thakis <thakis@chromium.org> | 2015-07-28 12:56:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-28 19:57:29 +0000 |
| commit | 3e07a4fbe0a687d6ae9993f02be3eb6ce8056b20 (patch) | |
| tree | 965850999de32757fd283b599c1ef93827da6e5e | |
| parent | 32241335f950deed4df725325eb7314d5896fdf0 (diff) | |
| download | chromium_src-3e07a4fbe0a687d6ae9993f02be3eb6ce8056b20.zip chromium_src-3e07a4fbe0a687d6ae9993f02be3eb6ce8056b20.tar.gz chromium_src-3e07a4fbe0a687d6ae9993f02be3eb6ce8056b20.tar.bz2 | |
Remove two unused functions in protobuf.
BUG=505316
Review URL: https://codereview.chromium.org/1265453003
Cr-Commit-Position: refs/heads/master@{#340750}
| -rw-r--r-- | third_party/protobuf/README.chromium | 4 | ||||
| -rw-r--r-- | third_party/protobuf/src/google/protobuf/stubs/strutil.cc | 7 | ||||
| -rw-r--r-- | third_party/protobuf/src/google/protobuf/wire_format.cc | 9 |
3 files changed, 3 insertions, 17 deletions
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium index ad65567..8f04687 100644 --- a/third_party/protobuf/README.chromium +++ b/third_party/protobuf/README.chromium @@ -45,4 +45,6 @@ Cherry-pick pherl changes to make protobuf build on VS2015. Cherry-pick c3cb53b (fix "sometimes-uninitialized" warning). -Cherry-pick https://github.com/google/protobuf/pull/621 +Cherry-pick https://github.com/google/protobuf/commit/56a90a2081379a5 + +Cherry-pick https://github.com/google/protobuf/commit/69d660b39ceabea diff --git a/third_party/protobuf/src/google/protobuf/stubs/strutil.cc b/third_party/protobuf/src/google/protobuf/stubs/strutil.cc index 917b3e9..00d1bc6 100644 --- a/third_party/protobuf/src/google/protobuf/stubs/strutil.cc +++ b/third_party/protobuf/src/google/protobuf/stubs/strutil.cc @@ -729,13 +729,6 @@ char *FastHex32ToBuffer(uint32 value, char* buffer) { return InternalFastHexToBuffer(value, buffer, 8); } -static inline char* PlaceNum(char* p, int num, char prev_sep) { - *p-- = '0' + num % 10; - *p-- = '0' + num / 10; - *p-- = prev_sep; - return p; -} - // ---------------------------------------------------------------------- // FastInt32ToBufferLeft() // FastUInt32ToBufferLeft() diff --git a/third_party/protobuf/src/google/protobuf/wire_format.cc b/third_party/protobuf/src/google/protobuf/wire_format.cc index 491eede..21350f5 100644 --- a/third_party/protobuf/src/google/protobuf/wire_format.cc +++ b/third_party/protobuf/src/google/protobuf/wire_format.cc @@ -53,15 +53,6 @@ namespace google { namespace protobuf { namespace internal { -namespace { - -// This function turns out to be convenient when using some macros later. -inline int GetEnumNumber(const EnumValueDescriptor* descriptor) { - return descriptor->number(); -} - -} // anonymous namespace - bool WireFormat::ParseAndMergePartial(io::CodedInputStream* input, Message* message) { const Descriptor* descriptor = message->GetDescriptor(); |