Эх сурвалжийг харах

Merge pull request #3073 from xfxyjwf/3.3.x

Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
Feng Xiao 8 жил өмнө
parent
commit
c2154e124d

+ 2 - 1
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);