diff options
| author | Austin Schuh <austin@peloton-tech.com> | 2014-10-31 16:27:55 -0700 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-05-20 10:38:52 -0700 |
| commit | 2f4d8a1b744e2e62dcd68b7cb7159000e5751975 (patch) | |
| tree | 93405474cde2e2c86ad04b56a2715499c721142e /src/google/protobuf/repeated_field.h | |
| parent | 4d8b123b8985b3f87a640be2d9a1b4b730b5fdca (diff) | |
| download | external_protobuf-2f4d8a1b744e2e62dcd68b7cb7159000e5751975.zip external_protobuf-2f4d8a1b744e2e62dcd68b7cb7159000e5751975.tar.gz external_protobuf-2f4d8a1b744e2e62dcd68b7cb7159000e5751975.tar.bz2 | |
Fixed Unused Parameter warning in headers.android-cts-6.0_r2android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r5android-6.0.1_r4android-6.0.1_r3android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1
Cherry-pick of:
https://github.com/google/protobuf/commit/918e3ee8b46a0f79f97ed0197de08bd61fa5f053
Bug: 21303860
Signed-off-by: Jeff Davidson <jpd@google.com>
Change-Id: I2690e676cde4c512412f3ccc15d9f50e59c88213
Diffstat (limited to 'src/google/protobuf/repeated_field.h')
| -rw-r--r-- | src/google/protobuf/repeated_field.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index 5005183..816ea68 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -83,7 +83,8 @@ inline int CalculateReserve(Iter begin, Iter end, std::forward_iterator_tag) { } template <typename Iter> -inline int CalculateReserve(Iter begin, Iter end, std::input_iterator_tag) { +inline int CalculateReserve(Iter /*begin*/, Iter /*end*/, + std::input_iterator_tag) { return -1; } |