diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2017-03-07 14:22:57 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-07 14:22:57 -0800 |
| commit | 2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a (patch) | |
| tree | 3be35c13ec3d76d03db356b191444523e7801b77 | |
| parent | f6d8c833845b90f61b95234cd090ec6e70058d06 (diff) | |
| parent | 21b58b51fea296434df40380aafb25346d5975ae (diff) | |
Merge pull request #2793 from keveman/master
Removed a stray return statement, causing compilation error.
| -rw-r--r-- | src/google/protobuf/repeated_field.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index 4e5bcf51..db5893b5 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -1487,7 +1487,6 @@ inline void RepeatedPtrFieldBase::Add( typename TypeHandler::Type* result = TypeHandler::New(arena_, std::move(value)); rep_->elements[current_size_++] = result; - return result; } #endif |