diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2017-05-08 13:38:48 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-08 13:38:48 -0700 |
| commit | c2154e124dfe0dc80b563568e2be4c599120a718 (patch) | |
| tree | ffedc8c9fc7ce5ab8349d151ee73802b1e2b3717 | |
| parent | d22493b6f60644e7b947864162727446ce5c0ad5 (diff) | |
| parent | 9b82fce7f1a5c7ce067866f06136e45fe9518cb2 (diff) | |
Merge pull request #3073 from xfxyjwf/3.3.x
Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
| -rw-r--r-- | src/google/protobuf/metadata_lite.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/metadata_lite.h b/src/google/protobuf/metadata_lite.h index 840c02e8..64fde0c6 100644 --- a/src/google/protobuf/metadata_lite.h +++ b/src/google/protobuf/metadata_lite.h @@ -167,7 +167,8 @@ class InternalMetadataWithArenaLite InternalMetadataWithArenaLite() {} explicit InternalMetadataWithArenaLite(Arena* arena) - : InternalMetadataWithArenaBase(arena) {} + : InternalMetadataWithArenaBase<string, + InternalMetadataWithArenaLite>(arena) {} void DoSwap(string* other) { mutable_unknown_fields()->swap(*other); |