diff options
| author |  xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-22 02:40:50 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-22 02:40:50 +0000 |
| commit | b55a20fa2c669b181f47ea9219b8e74d1263da19 (patch) | |
| tree | 3936a0e7c22196587a6d8397372de41434fe2129 /src/google/protobuf/wire_format.h | |
| parent | 9ced30caf94bb4e7e9629c199679ff44e8ca7389 (diff) | |
Down-integrate from internal branch
Diffstat (limited to 'src/google/protobuf/wire_format.h')
| -rw-r--r-- | src/google/protobuf/wire_format.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/wire_format.h b/src/google/protobuf/wire_format.h index c7539250..6c3f44a4 100644 --- a/src/google/protobuf/wire_format.h +++ b/src/google/protobuf/wire_format.h @@ -40,6 +40,7 @@ #define GOOGLE_PROTOBUF_WIRE_FORMAT_H__ #include <string> +#include <google/protobuf/stubs/common.h> #include <google/protobuf/descriptor.pb.h> #include <google/protobuf/descriptor.h> #include <google/protobuf/message.h> @@ -253,7 +254,7 @@ class LIBPROTOBUF_EXPORT UnknownFieldSetFieldSkipper : public FieldSkipper { virtual bool SkipMessage(io::CodedInputStream* input); virtual void SkipUnknownEnum(int field_number, int value); - private: + protected: UnknownFieldSet* unknown_fields_; }; |