| Index: third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h
|
| index 708ea5668f9c15b6a545cf9e6e73c333dc42cbc4..d2dba1533442d4dcf66ae44fe0053cacde81dffb 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h
|
| @@ -41,10 +41,12 @@ namespace compiler {
|
| namespace objectivec {
|
|
|
| class MessageFieldGenerator : public ObjCObjFieldGenerator {
|
| - friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
|
| + friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field,
|
| + const Options& options);
|
|
|
| protected:
|
| - explicit MessageFieldGenerator(const FieldDescriptor* descriptor);
|
| + MessageFieldGenerator(const FieldDescriptor* descriptor,
|
| + const Options& options);
|
| virtual ~MessageFieldGenerator();
|
| virtual bool WantsHasProperty(void) const;
|
|
|
| @@ -56,12 +58,17 @@ class MessageFieldGenerator : public ObjCObjFieldGenerator {
|
| };
|
|
|
| class RepeatedMessageFieldGenerator : public RepeatedFieldGenerator {
|
| - friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
|
| + friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field,
|
| + const Options& options);
|
|
|
| protected:
|
| - explicit RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor);
|
| + RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor,
|
| + const Options& options);
|
| virtual ~RepeatedMessageFieldGenerator();
|
|
|
| + public:
|
| + virtual void DetermineForwardDeclarations(set<string>* fwd_decls) const;
|
| +
|
| private:
|
| GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedMessageFieldGenerator);
|
| };
|
|
|