Integrate recent changes from google3.

protoc
- New flags --encode and --decode can be used to convert between protobuf text
  format and binary format from the command-line.
- New flag --descriptor_set_out can be used to write FileDescriptorProtos for
  all parsed files directly into a single output file.  This is particularly
  useful if you wish to parse .proto files from programs written in languages
  other than C++: just run protoc as a background process and have it output
  a FileDescriptorList, then parse that natively.

C++
- Reflection objects are now per-class rather than per-instance.  To make this
  possible, the Reflection interface had to be changed such that all methods
  take the Message instance as a parameter.  This change improves performance
  significantly in memory-bandwidth-limited use cases, since it makes the
  message objects smaller.  Note that source-incompatible interface changes
  like this will not be made again after the library leaves beta.

Python
- MergeFrom(message) and CopyFrom(message) are now implemented.
- SerializeToString() raises an exception if the message is missing required
  fields.
- Code organization improvements.
- Fixed doc comments for RpcController and RpcChannel, which had somehow been
  swapped.

1 files changed, 195 insertions, 91 deletions

diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index 892f92d0..926e9bd0 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -7,7 +7,7 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 2000000
+#if GOOGLE_PROTOBUF_VERSION < 2000001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
@@ -25,6 +25,10 @@
 namespace google {
 namespace protobuf {
 
+// Internal implementation detail -- do not call this.
+void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
+
+class FileDescriptorSet;
 class FileDescriptorProto;
 class DescriptorProto;
 class DescriptorProto_ExtensionRange;
@@ -96,6 +100,92 @@ const FieldOptions_CType FieldOptions_CType_CType_MAX = FieldOptions_CType_STRIN
 
 // ===================================================================
 
+class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message {
+ public:
+  FileDescriptorSet();
+  virtual ~FileDescriptorSet();
+  
+  FileDescriptorSet(const FileDescriptorSet& from);
+  
+  inline FileDescriptorSet& operator=(const FileDescriptorSet& from) {
+    CopyFrom(from);
+    return *this;
+  }
+  
+  inline static const FileDescriptorSet& default_instance() {
+    return default_instance_;
+  }
+  
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+  
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+  
+  static const ::google::protobuf::Descriptor* descriptor();
+  
+  // implements Message ----------------------------------------------
+  
+  FileDescriptorSet* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const FileDescriptorSet& from);
+  void MergeFrom(const FileDescriptorSet& from);
+  void Clear();
+  bool IsInitialized() const;
+  int ByteSize() const;
+  
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  bool SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SetCachedSize(int size) const { _cached_size_ = size; }
+  public:
+  
+  const ::google::protobuf::Descriptor* GetDescriptor() const;
+  const ::google::protobuf::Reflection* GetReflection() const;
+  
+  // nested types ----------------------------------------------------
+  
+  // accessors -------------------------------------------------------
+  
+  // repeated .google.protobuf.FileDescriptorProto file = 1;
+  inline int file_size() const;
+  inline void clear_file();
+  inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >& file() const;
+  inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >* mutable_file();
+  inline const ::google::protobuf::FileDescriptorProto& file(int index) const;
+  inline ::google::protobuf::FileDescriptorProto* mutable_file(int index);
+  inline ::google::protobuf::FileDescriptorProto* add_file();
+  
+ private:
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+  mutable int _cached_size_;
+  
+  ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto > file_;
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
+  static const FileDescriptorSet default_instance_;
+  static const int _offsets_[1];
+  
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  
+  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
+  inline bool _has_bit(int index) const {
+    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
+  }
+  inline void _set_bit(int index) {
+    _has_bits_[index / 32] |= (1u << (index % 32));
+  }
+  inline void _clear_bit(int index) {
+    _has_bits_[index / 32] &= ~(1u << (index % 32));
+  }
+};
+// -------------------------------------------------------------------
+
 class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Message {
  public:
   FileDescriptorProto();
@@ -113,11 +203,11 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -143,8 +233,7 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -222,7 +311,7 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
   inline ::google::protobuf::FileOptions* mutable_options();
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::std::string* name_;
@@ -235,7 +324,7 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
   ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto > service_;
   ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto > extension_;
   ::google::protobuf::FileOptions* options_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const FileDescriptorProto default_instance_;
   static const int _offsets_[8];
   
@@ -271,11 +360,11 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -301,8 +390,7 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -321,12 +409,12 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
   inline void set_end(::google::protobuf::int32 value);
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::google::protobuf::int32 start_;
   ::google::protobuf::int32 end_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const DescriptorProto_ExtensionRange default_instance_;
   static const int _offsets_[2];
   
@@ -362,11 +450,11 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -392,8 +480,7 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -461,7 +548,7 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
   inline ::google::protobuf::MessageOptions* mutable_options();
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::std::string* name_;
@@ -472,7 +559,7 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
   ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto > enum_type_;
   ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange > extension_range_;
   ::google::protobuf::MessageOptions* options_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const DescriptorProto default_instance_;
   static const int _offsets_[7];
   
@@ -508,11 +595,11 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -538,8 +625,7 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -649,7 +735,7 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
   inline ::google::protobuf::FieldOptions* mutable_options();
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::std::string* name_;
@@ -664,7 +750,7 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
   ::std::string* default_value_;
   static const ::std::string _default_default_value_;
   ::google::protobuf::FieldOptions* options_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const FieldDescriptorProto default_instance_;
   static const int _offsets_[8];
   
@@ -700,11 +786,11 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -730,8 +816,7 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -761,14 +846,14 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
   inline ::google::protobuf::EnumOptions* mutable_options();
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::std::string* name_;
   static const ::std::string _default_name_;
   ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto > value_;
   ::google::protobuf::EnumOptions* options_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const EnumDescriptorProto default_instance_;
   static const int _offsets_[3];
   
@@ -804,11 +889,11 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -834,8 +919,7 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -862,14 +946,14 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
   inline ::google::protobuf::EnumValueOptions* mutable_options();
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::std::string* name_;
   static const ::std::string _default_name_;
   ::google::protobuf::int32 number_;
   ::google::protobuf::EnumValueOptions* options_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const EnumValueDescriptorProto default_instance_;
   static const int _offsets_[3];
   
@@ -905,11 +989,11 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -935,8 +1019,7 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -966,14 +1049,14 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
   inline ::google::protobuf::ServiceOptions* mutable_options();
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::std::string* name_;
   static const ::std::string _default_name_;
   ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto > method_;
   ::google::protobuf::ServiceOptions* options_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const ServiceDescriptorProto default_instance_;
   static const int _offsets_[3];
   
@@ -1009,11 +1092,11 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -1039,8 +1122,7 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -1077,7 +1159,7 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
   inline ::google::protobuf::MethodOptions* mutable_options();
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::std::string* name_;
@@ -1087,7 +1169,7 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
   ::std::string* output_type_;
   static const ::std::string _default_output_type_;
   ::google::protobuf::MethodOptions* options_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const MethodDescriptorProto default_instance_;
   static const int _offsets_[4];
   
@@ -1123,11 +1205,11 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -1153,8 +1235,7 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -1204,7 +1285,7 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
   inline void set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value);
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   ::std::string* java_package_;
@@ -1213,7 +1294,7 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
   static const ::std::string _default_java_outer_classname_;
   bool java_multiple_files_;
   int optimize_for_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const FileOptions default_instance_;
   static const int _offsets_[4];
   
@@ -1249,11 +1330,11 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -1279,8 +1360,7 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -1293,11 +1373,11 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
   inline void set_message_set_wire_format(bool value);
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   bool message_set_wire_format_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const MessageOptions default_instance_;
   static const int _offsets_[1];
   
@@ -1333,11 +1413,11 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -1363,8 +1443,7 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
@@ -1400,13 +1479,13 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
   inline ::std::string* mutable_experimental_map_key();
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
   int ctype_;
   ::std::string* experimental_map_key_;
   static const ::std::string _default_experimental_map_key_;
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const FieldOptions default_instance_;
   static const int _offsets_[2];
   
@@ -1442,11 +1521,11 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -1472,18 +1551,17 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
   // accessors -------------------------------------------------------
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const EnumOptions default_instance_;
   static const int _offsets_[1];
   
@@ -1519,11 +1597,11 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -1549,18 +1627,17 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
   // accessors -------------------------------------------------------
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const EnumValueOptions default_instance_;
   static const int _offsets_[1];
   
@@ -1596,11 +1673,11 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -1626,18 +1703,17 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
   // accessors -------------------------------------------------------
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const ServiceOptions default_instance_;
   static const int _offsets_[1];
   
@@ -1673,11 +1749,11 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {
   }
   
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _reflection_.unknown_fields();
+    return _unknown_fields_;
   }
   
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _reflection_.mutable_unknown_fields();
+    return &_unknown_fields_;
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
@@ -1703,18 +1779,17 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {
   public:
   
   const ::google::protobuf::Descriptor* GetDescriptor() const;
-  const ::google::protobuf::Message::Reflection* GetReflection() const;
-  ::google::protobuf::Message::Reflection* GetReflection();
+  const ::google::protobuf::Reflection* GetReflection() const;
   
   // nested types ----------------------------------------------------
   
   // accessors -------------------------------------------------------
   
  private:
-  ::google::protobuf::internal::GeneratedMessageReflection _reflection_;
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
-  
+  friend void protobuf_BuildDesc_google_2fprotobuf_2fdescriptor_2eproto();
   static const MethodOptions default_instance_;
   static const int _offsets_[1];
   
@@ -1739,6 +1814,35 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {
 
 // ===================================================================
 
+// FileDescriptorSet
+
+// repeated .google.protobuf.FileDescriptorProto file = 1;
+inline int FileDescriptorSet::file_size() const {
+  return file_.size();
+}
+inline void FileDescriptorSet::clear_file() {
+  file_.Clear();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >&
+FileDescriptorSet::file() const {
+  return file_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >*
+FileDescriptorSet::mutable_file() {
+  return &file_;
+}
+inline const ::google::protobuf::FileDescriptorProto& FileDescriptorSet::file(int index) const {
+  return file_.Get(index);
+}
+inline ::google::protobuf::FileDescriptorProto* FileDescriptorSet::mutable_file(int index) {
+  return file_.Mutable(index);
+}
+inline ::google::protobuf::FileDescriptorProto* FileDescriptorSet::add_file() {
+  return file_.Add();
+}
+
+// -------------------------------------------------------------------
+
 // FileDescriptorProto
 
 // optional string name = 1;