diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2017-05-08 11:19:02 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-08 11:19:02 -0700 |
commit | 455b61c6b0f39ac269b26969877dd3c6f3e32270 (patch) | |
tree | 96907fd0cb593432189c3400562d95daaca3eda4 /src | |
parent | 25abd7b7e7a6e7f3dfabe6b3a762e2346b2ae185 (diff) | |
parent | cd0efc0024482be745e1671461518bac07335ca1 (diff) | |
download | protobuf-455b61c6b0f39ac269b26969877dd3c6f3e32270.tar.gz protobuf-455b61c6b0f39ac269b26969877dd3c6f3e32270.tar.bz2 protobuf-455b61c6b0f39ac269b26969877dd3c6f3e32270.zip |
Merge pull request #3062 from Oppen/master
Workaround gcc < 4.5.0 bug
Diffstat (limited to 'src')
-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); |