[3party] Updated protobuf to 2.5.0

1 files changed, 505 insertions, 314 deletions

diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h
index 8e87a63e21..109d014e35 100644
--- a/indexer/drules_struct.pb.h
+++ b/indexer/drules_struct.pb.h
@@ -8,21 +8,23 @@
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 2004000
+#if GOOGLE_PROTOBUF_VERSION < 2005000
 #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.
 #endif
-#if 2004001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
 #include <google/protobuf/generated_message_util.h>
+#include <google/protobuf/message.h>
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/generated_enum_reflection.h>
+#include <google/protobuf/unknown_field_set.h>
 // @@protoc_insertion_point(includes)
 
 // Internal implementation detail -- do not call these.
@@ -90,29 +92,29 @@ class DashDotProto : public ::google::protobuf::Message {
  public:
   DashDotProto();
   virtual ~DashDotProto();
-  
+
   DashDotProto(const DashDotProto& from);
-  
+
   inline DashDotProto& operator=(const DashDotProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const DashDotProto& default_instance();
-  
+
   void Swap(DashDotProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   DashDotProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -120,7 +122,7 @@ class DashDotProto : public ::google::protobuf::Message {
   void MergeFrom(const DashDotProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -133,13 +135,13 @@ class DashDotProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // repeated double dd = 1;
   inline int dd_size() const;
   inline void clear_dd();
@@ -151,31 +153,31 @@ class DashDotProto : public ::google::protobuf::Message {
       dd() const;
   inline ::google::protobuf::RepeatedField< double >*
       mutable_dd();
-  
+
   // optional double offset = 2;
   inline bool has_offset() const;
   inline void clear_offset();
   static const int kOffsetFieldNumber = 2;
   inline double offset() const;
   inline void set_offset(double value);
-  
+
   // @@protoc_insertion_point(class_scope:DashDotProto)
  private:
   inline void set_has_offset();
   inline void clear_has_offset();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::google::protobuf::RepeatedField< double > dd_;
   double offset_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static DashDotProto* default_instance_;
 };
@@ -185,29 +187,29 @@ class PathSymProto : public ::google::protobuf::Message {
  public:
   PathSymProto();
   virtual ~PathSymProto();
-  
+
   PathSymProto(const PathSymProto& from);
-  
+
   inline PathSymProto& operator=(const PathSymProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const PathSymProto& default_instance();
-  
+
   void Swap(PathSymProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   PathSymProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -215,7 +217,7 @@ class PathSymProto : public ::google::protobuf::Message {
   void MergeFrom(const PathSymProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -228,13 +230,13 @@ class PathSymProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required string name = 1;
   inline bool has_name() const;
   inline void clear_name();
@@ -245,21 +247,22 @@ class PathSymProto : public ::google::protobuf::Message {
   inline void set_name(const char* value, size_t size);
   inline ::std::string* mutable_name();
   inline ::std::string* release_name();
-  
+  inline void set_allocated_name(::std::string* name);
+
   // required double step = 2;
   inline bool has_step() const;
   inline void clear_step();
   static const int kStepFieldNumber = 2;
   inline double step() const;
   inline void set_step(double value);
-  
+
   // optional double offset = 3;
   inline bool has_offset() const;
   inline void clear_offset();
   static const int kOffsetFieldNumber = 3;
   inline double offset() const;
   inline void set_offset(double value);
-  
+
   // @@protoc_insertion_point(class_scope:PathSymProto)
  private:
   inline void set_has_name();
@@ -268,20 +271,20 @@ class PathSymProto : public ::google::protobuf::Message {
   inline void clear_has_step();
   inline void set_has_offset();
   inline void clear_has_offset();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::std::string* name_;
   double step_;
   double offset_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static PathSymProto* default_instance_;
 };
@@ -291,29 +294,29 @@ class LineRuleProto : public ::google::protobuf::Message {
  public:
   LineRuleProto();
   virtual ~LineRuleProto();
-  
+
   LineRuleProto(const LineRuleProto& from);
-  
+
   inline LineRuleProto& operator=(const LineRuleProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const LineRuleProto& default_instance();
-  
+
   void Swap(LineRuleProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   LineRuleProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -321,7 +324,7 @@ class LineRuleProto : public ::google::protobuf::Message {
   void MergeFrom(const LineRuleProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -334,27 +337,27 @@ class LineRuleProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required double width = 1;
   inline bool has_width() const;
   inline void clear_width();
   static const int kWidthFieldNumber = 1;
   inline double width() const;
   inline void set_width(double value);
-  
+
   // required uint32 color = 2;
   inline bool has_color() const;
   inline void clear_color();
   static const int kColorFieldNumber = 2;
   inline ::google::protobuf::uint32 color() const;
   inline void set_color(::google::protobuf::uint32 value);
-  
+
   // optional .DashDotProto dashdot = 3;
   inline bool has_dashdot() const;
   inline void clear_dashdot();
@@ -362,14 +365,15 @@ class LineRuleProto : public ::google::protobuf::Message {
   inline const ::DashDotProto& dashdot() const;
   inline ::DashDotProto* mutable_dashdot();
   inline ::DashDotProto* release_dashdot();
-  
+  inline void set_allocated_dashdot(::DashDotProto* dashdot);
+
   // required int32 priority = 4;
   inline bool has_priority() const;
   inline void clear_priority();
   static const int kPriorityFieldNumber = 4;
   inline ::google::protobuf::int32 priority() const;
   inline void set_priority(::google::protobuf::int32 value);
-  
+
   // optional .PathSymProto pathsym = 5;
   inline bool has_pathsym() const;
   inline void clear_pathsym();
@@ -377,21 +381,22 @@ class LineRuleProto : public ::google::protobuf::Message {
   inline const ::PathSymProto& pathsym() const;
   inline ::PathSymProto* mutable_pathsym();
   inline ::PathSymProto* release_pathsym();
-  
+  inline void set_allocated_pathsym(::PathSymProto* pathsym);
+
   // optional .LineJoin join = 6;
   inline bool has_join() const;
   inline void clear_join();
   static const int kJoinFieldNumber = 6;
-  inline LineJoin join() const;
-  inline void set_join(LineJoin value);
-  
+  inline ::LineJoin join() const;
+  inline void set_join(::LineJoin value);
+
   // optional .LineCap cap = 7;
   inline bool has_cap() const;
   inline void clear_cap();
   static const int kCapFieldNumber = 7;
-  inline LineCap cap() const;
-  inline void set_cap(LineCap value);
-  
+  inline ::LineCap cap() const;
+  inline void set_cap(::LineCap value);
+
   // @@protoc_insertion_point(class_scope:LineRuleProto)
  private:
   inline void set_has_width();
@@ -408,9 +413,9 @@ class LineRuleProto : public ::google::protobuf::Message {
   inline void clear_has_join();
   inline void set_has_cap();
   inline void clear_has_cap();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   double width_;
   ::DashDotProto* dashdot_;
   ::google::protobuf::uint32 color_;
@@ -418,14 +423,14 @@ class LineRuleProto : public ::google::protobuf::Message {
   ::PathSymProto* pathsym_;
   int join_;
   int cap_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static LineRuleProto* default_instance_;
 };
@@ -435,29 +440,29 @@ class LineDefProto : public ::google::protobuf::Message {
  public:
   LineDefProto();
   virtual ~LineDefProto();
-  
+
   LineDefProto(const LineDefProto& from);
-  
+
   inline LineDefProto& operator=(const LineDefProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const LineDefProto& default_instance();
-  
+
   void Swap(LineDefProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   LineDefProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -465,7 +470,7 @@ class LineDefProto : public ::google::protobuf::Message {
   void MergeFrom(const LineDefProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -478,27 +483,27 @@ class LineDefProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required double width = 1;
   inline bool has_width() const;
   inline void clear_width();
   static const int kWidthFieldNumber = 1;
   inline double width() const;
   inline void set_width(double value);
-  
+
   // required uint32 color = 2;
   inline bool has_color() const;
   inline void clear_color();
   static const int kColorFieldNumber = 2;
   inline ::google::protobuf::uint32 color() const;
   inline void set_color(::google::protobuf::uint32 value);
-  
+
   // optional .DashDotProto dashdot = 3;
   inline bool has_dashdot() const;
   inline void clear_dashdot();
@@ -506,7 +511,8 @@ class LineDefProto : public ::google::protobuf::Message {
   inline const ::DashDotProto& dashdot() const;
   inline ::DashDotProto* mutable_dashdot();
   inline ::DashDotProto* release_dashdot();
-  
+  inline void set_allocated_dashdot(::DashDotProto* dashdot);
+
   // optional .PathSymProto pathsym = 4;
   inline bool has_pathsym() const;
   inline void clear_pathsym();
@@ -514,21 +520,22 @@ class LineDefProto : public ::google::protobuf::Message {
   inline const ::PathSymProto& pathsym() const;
   inline ::PathSymProto* mutable_pathsym();
   inline ::PathSymProto* release_pathsym();
-  
+  inline void set_allocated_pathsym(::PathSymProto* pathsym);
+
   // optional .LineJoin join = 6;
   inline bool has_join() const;
   inline void clear_join();
   static const int kJoinFieldNumber = 6;
-  inline LineJoin join() const;
-  inline void set_join(LineJoin value);
-  
+  inline ::LineJoin join() const;
+  inline void set_join(::LineJoin value);
+
   // optional .LineCap cap = 7;
   inline bool has_cap() const;
   inline void clear_cap();
   static const int kCapFieldNumber = 7;
-  inline LineCap cap() const;
-  inline void set_cap(LineCap value);
-  
+  inline ::LineCap cap() const;
+  inline void set_cap(::LineCap value);
+
   // @@protoc_insertion_point(class_scope:LineDefProto)
  private:
   inline void set_has_width();
@@ -543,23 +550,23 @@ class LineDefProto : public ::google::protobuf::Message {
   inline void clear_has_join();
   inline void set_has_cap();
   inline void clear_has_cap();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   double width_;
   ::DashDotProto* dashdot_;
   ::google::protobuf::uint32 color_;
   int join_;
   ::PathSymProto* pathsym_;
   int cap_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static LineDefProto* default_instance_;
 };
@@ -569,29 +576,29 @@ class AreaRuleProto : public ::google::protobuf::Message {
  public:
   AreaRuleProto();
   virtual ~AreaRuleProto();
-  
+
   AreaRuleProto(const AreaRuleProto& from);
-  
+
   inline AreaRuleProto& operator=(const AreaRuleProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const AreaRuleProto& default_instance();
-  
+
   void Swap(AreaRuleProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   AreaRuleProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -599,7 +606,7 @@ class AreaRuleProto : public ::google::protobuf::Message {
   void MergeFrom(const AreaRuleProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -612,20 +619,20 @@ class AreaRuleProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required uint32 color = 1;
   inline bool has_color() const;
   inline void clear_color();
   static const int kColorFieldNumber = 1;
   inline ::google::protobuf::uint32 color() const;
   inline void set_color(::google::protobuf::uint32 value);
-  
+
   // optional .LineDefProto border = 2;
   inline bool has_border() const;
   inline void clear_border();
@@ -633,14 +640,15 @@ class AreaRuleProto : public ::google::protobuf::Message {
   inline const ::LineDefProto& border() const;
   inline ::LineDefProto* mutable_border();
   inline ::LineDefProto* release_border();
-  
+  inline void set_allocated_border(::LineDefProto* border);
+
   // required int32 priority = 3;
   inline bool has_priority() const;
   inline void clear_priority();
   static const int kPriorityFieldNumber = 3;
   inline ::google::protobuf::int32 priority() const;
   inline void set_priority(::google::protobuf::int32 value);
-  
+
   // @@protoc_insertion_point(class_scope:AreaRuleProto)
  private:
   inline void set_has_color();
@@ -649,20 +657,20 @@ class AreaRuleProto : public ::google::protobuf::Message {
   inline void clear_has_border();
   inline void set_has_priority();
   inline void clear_has_priority();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::LineDefProto* border_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::int32 priority_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static AreaRuleProto* default_instance_;
 };
@@ -672,29 +680,29 @@ class SymbolRuleProto : public ::google::protobuf::Message {
  public:
   SymbolRuleProto();
   virtual ~SymbolRuleProto();
-  
+
   SymbolRuleProto(const SymbolRuleProto& from);
-  
+
   inline SymbolRuleProto& operator=(const SymbolRuleProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const SymbolRuleProto& default_instance();
-  
+
   void Swap(SymbolRuleProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   SymbolRuleProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -702,7 +710,7 @@ class SymbolRuleProto : public ::google::protobuf::Message {
   void MergeFrom(const SymbolRuleProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -715,13 +723,13 @@ class SymbolRuleProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required string name = 1;
   inline bool has_name() const;
   inline void clear_name();
@@ -732,21 +740,22 @@ class SymbolRuleProto : public ::google::protobuf::Message {
   inline void set_name(const char* value, size_t size);
   inline ::std::string* mutable_name();
   inline ::std::string* release_name();
-  
+  inline void set_allocated_name(::std::string* name);
+
   // optional int32 apply_for_type = 2;
   inline bool has_apply_for_type() const;
   inline void clear_apply_for_type();
   static const int kApplyForTypeFieldNumber = 2;
   inline ::google::protobuf::int32 apply_for_type() const;
   inline void set_apply_for_type(::google::protobuf::int32 value);
-  
+
   // required int32 priority = 3;
   inline bool has_priority() const;
   inline void clear_priority();
   static const int kPriorityFieldNumber = 3;
   inline ::google::protobuf::int32 priority() const;
   inline void set_priority(::google::protobuf::int32 value);
-  
+
   // @@protoc_insertion_point(class_scope:SymbolRuleProto)
  private:
   inline void set_has_name();
@@ -755,20 +764,20 @@ class SymbolRuleProto : public ::google::protobuf::Message {
   inline void clear_has_apply_for_type();
   inline void set_has_priority();
   inline void clear_has_priority();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::std::string* name_;
   ::google::protobuf::int32 apply_for_type_;
   ::google::protobuf::int32 priority_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static SymbolRuleProto* default_instance_;
 };
@@ -778,29 +787,29 @@ class CaptionDefProto : public ::google::protobuf::Message {
  public:
   CaptionDefProto();
   virtual ~CaptionDefProto();
-  
+
   CaptionDefProto(const CaptionDefProto& from);
-  
+
   inline CaptionDefProto& operator=(const CaptionDefProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const CaptionDefProto& default_instance();
-  
+
   void Swap(CaptionDefProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   CaptionDefProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -808,7 +817,7 @@ class CaptionDefProto : public ::google::protobuf::Message {
   void MergeFrom(const CaptionDefProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -821,48 +830,48 @@ class CaptionDefProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required int32 height = 1;
   inline bool has_height() const;
   inline void clear_height();
   static const int kHeightFieldNumber = 1;
   inline ::google::protobuf::int32 height() const;
   inline void set_height(::google::protobuf::int32 value);
-  
+
   // required uint32 color = 2;
   inline bool has_color() const;
   inline void clear_color();
   static const int kColorFieldNumber = 2;
   inline ::google::protobuf::uint32 color() const;
   inline void set_color(::google::protobuf::uint32 value);
-  
+
   // optional uint32 stroke_color = 3;
   inline bool has_stroke_color() const;
   inline void clear_stroke_color();
   static const int kStrokeColorFieldNumber = 3;
   inline ::google::protobuf::uint32 stroke_color() const;
   inline void set_stroke_color(::google::protobuf::uint32 value);
-  
+
   // optional int32 offset_x = 4;
   inline bool has_offset_x() const;
   inline void clear_offset_x();
   static const int kOffsetXFieldNumber = 4;
   inline ::google::protobuf::int32 offset_x() const;
   inline void set_offset_x(::google::protobuf::int32 value);
-  
+
   // optional int32 offset_y = 5;
   inline bool has_offset_y() const;
   inline void clear_offset_y();
   static const int kOffsetYFieldNumber = 5;
   inline ::google::protobuf::int32 offset_y() const;
   inline void set_offset_y(::google::protobuf::int32 value);
-  
+
   // @@protoc_insertion_point(class_scope:CaptionDefProto)
  private:
   inline void set_has_height();
@@ -875,22 +884,22 @@ class CaptionDefProto : public ::google::protobuf::Message {
   inline void clear_has_offset_x();
   inline void set_has_offset_y();
   inline void clear_has_offset_y();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::google::protobuf::int32 height_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::uint32 stroke_color_;
   ::google::protobuf::int32 offset_x_;
   ::google::protobuf::int32 offset_y_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static CaptionDefProto* default_instance_;
 };
@@ -900,29 +909,29 @@ class CaptionRuleProto : public ::google::protobuf::Message {
  public:
   CaptionRuleProto();
   virtual ~CaptionRuleProto();
-  
+
   CaptionRuleProto(const CaptionRuleProto& from);
-  
+
   inline CaptionRuleProto& operator=(const CaptionRuleProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const CaptionRuleProto& default_instance();
-  
+
   void Swap(CaptionRuleProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   CaptionRuleProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -930,7 +939,7 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   void MergeFrom(const CaptionRuleProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -943,13 +952,13 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required .CaptionDefProto primary = 1;
   inline bool has_primary() const;
   inline void clear_primary();
@@ -957,7 +966,8 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   inline const ::CaptionDefProto& primary() const;
   inline ::CaptionDefProto* mutable_primary();
   inline ::CaptionDefProto* release_primary();
-  
+  inline void set_allocated_primary(::CaptionDefProto* primary);
+
   // optional .CaptionDefProto secondary = 2;
   inline bool has_secondary() const;
   inline void clear_secondary();
@@ -965,14 +975,15 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   inline const ::CaptionDefProto& secondary() const;
   inline ::CaptionDefProto* mutable_secondary();
   inline ::CaptionDefProto* release_secondary();
-  
+  inline void set_allocated_secondary(::CaptionDefProto* secondary);
+
   // required int32 priority = 3;
   inline bool has_priority() const;
   inline void clear_priority();
   static const int kPriorityFieldNumber = 3;
   inline ::google::protobuf::int32 priority() const;
   inline void set_priority(::google::protobuf::int32 value);
-  
+
   // @@protoc_insertion_point(class_scope:CaptionRuleProto)
  private:
   inline void set_has_primary();
@@ -981,20 +992,20 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   inline void clear_has_secondary();
   inline void set_has_priority();
   inline void clear_has_priority();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::CaptionDefProto* primary_;
   ::CaptionDefProto* secondary_;
   ::google::protobuf::int32 priority_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static CaptionRuleProto* default_instance_;
 };
@@ -1004,29 +1015,29 @@ class CircleRuleProto : public ::google::protobuf::Message {
  public:
   CircleRuleProto();
   virtual ~CircleRuleProto();
-  
+
   CircleRuleProto(const CircleRuleProto& from);
-  
+
   inline CircleRuleProto& operator=(const CircleRuleProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const CircleRuleProto& default_instance();
-  
+
   void Swap(CircleRuleProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   CircleRuleProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -1034,7 +1045,7 @@ class CircleRuleProto : public ::google::protobuf::Message {
   void MergeFrom(const CircleRuleProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -1047,27 +1058,27 @@ class CircleRuleProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required double radius = 1;
   inline bool has_radius() const;
   inline void clear_radius();
   static const int kRadiusFieldNumber = 1;
   inline double radius() const;
   inline void set_radius(double value);
-  
+
   // required uint32 color = 2;
   inline bool has_color() const;
   inline void clear_color();
   static const int kColorFieldNumber = 2;
   inline ::google::protobuf::uint32 color() const;
   inline void set_color(::google::protobuf::uint32 value);
-  
+
   // optional .LineDefProto border = 3;
   inline bool has_border() const;
   inline void clear_border();
@@ -1075,14 +1086,15 @@ class CircleRuleProto : public ::google::protobuf::Message {
   inline const ::LineDefProto& border() const;
   inline ::LineDefProto* mutable_border();
   inline ::LineDefProto* release_border();
-  
+  inline void set_allocated_border(::LineDefProto* border);
+
   // required int32 priority = 4;
   inline bool has_priority() const;
   inline void clear_priority();
   static const int kPriorityFieldNumber = 4;
   inline ::google::protobuf::int32 priority() const;
   inline void set_priority(::google::protobuf::int32 value);
-  
+
   // @@protoc_insertion_point(class_scope:CircleRuleProto)
  private:
   inline void set_has_radius();
@@ -1093,21 +1105,21 @@ class CircleRuleProto : public ::google::protobuf::Message {
   inline void clear_has_border();
   inline void set_has_priority();
   inline void clear_has_priority();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   double radius_;
   ::LineDefProto* border_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::int32 priority_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static CircleRuleProto* default_instance_;
 };
@@ -1117,29 +1129,29 @@ class PathTextRuleProto : public ::google::protobuf::Message {
  public:
   PathTextRuleProto();
   virtual ~PathTextRuleProto();
-  
+
   PathTextRuleProto(const PathTextRuleProto& from);
-  
+
   inline PathTextRuleProto& operator=(const PathTextRuleProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const PathTextRuleProto& default_instance();
-  
+
   void Swap(PathTextRuleProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   PathTextRuleProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -1147,7 +1159,7 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   void MergeFrom(const PathTextRuleProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -1160,13 +1172,13 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required .CaptionDefProto primary = 1;
   inline bool has_primary() const;
   inline void clear_primary();
@@ -1174,7 +1186,8 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   inline const ::CaptionDefProto& primary() const;
   inline ::CaptionDefProto* mutable_primary();
   inline ::CaptionDefProto* release_primary();
-  
+  inline void set_allocated_primary(::CaptionDefProto* primary);
+
   // optional .CaptionDefProto secondary = 2;
   inline bool has_secondary() const;
   inline void clear_secondary();
@@ -1182,14 +1195,15 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   inline const ::CaptionDefProto& secondary() const;
   inline ::CaptionDefProto* mutable_secondary();
   inline ::CaptionDefProto* release_secondary();
-  
+  inline void set_allocated_secondary(::CaptionDefProto* secondary);
+
   // required int32 priority = 3;
   inline bool has_priority() const;
   inline void clear_priority();
   static const int kPriorityFieldNumber = 3;
   inline ::google::protobuf::int32 priority() const;
   inline void set_priority(::google::protobuf::int32 value);
-  
+
   // @@protoc_insertion_point(class_scope:PathTextRuleProto)
  private:
   inline void set_has_primary();
@@ -1198,20 +1212,20 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   inline void clear_has_secondary();
   inline void set_has_priority();
   inline void clear_has_priority();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::CaptionDefProto* primary_;
   ::CaptionDefProto* secondary_;
   ::google::protobuf::int32 priority_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static PathTextRuleProto* default_instance_;
 };
@@ -1221,29 +1235,29 @@ class DrawElementProto : public ::google::protobuf::Message {
  public:
   DrawElementProto();
   virtual ~DrawElementProto();
-  
+
   DrawElementProto(const DrawElementProto& from);
-  
+
   inline DrawElementProto& operator=(const DrawElementProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const DrawElementProto& default_instance();
-  
+
   void Swap(DrawElementProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   DrawElementProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -1251,7 +1265,7 @@ class DrawElementProto : public ::google::protobuf::Message {
   void MergeFrom(const DrawElementProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -1264,20 +1278,20 @@ class DrawElementProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required int32 scale = 1;
   inline bool has_scale() const;
   inline void clear_scale();
   static const int kScaleFieldNumber = 1;
   inline ::google::protobuf::int32 scale() const;
   inline void set_scale(::google::protobuf::int32 value);
-  
+
   // repeated .LineRuleProto lines = 2;
   inline int lines_size() const;
   inline void clear_lines();
@@ -1289,7 +1303,7 @@ class DrawElementProto : public ::google::protobuf::Message {
       lines() const;
   inline ::google::protobuf::RepeatedPtrField< ::LineRuleProto >*
       mutable_lines();
-  
+
   // optional .AreaRuleProto area = 3;
   inline bool has_area() const;
   inline void clear_area();
@@ -1297,7 +1311,8 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline const ::AreaRuleProto& area() const;
   inline ::AreaRuleProto* mutable_area();
   inline ::AreaRuleProto* release_area();
-  
+  inline void set_allocated_area(::AreaRuleProto* area);
+
   // optional .SymbolRuleProto symbol = 4;
   inline bool has_symbol() const;
   inline void clear_symbol();
@@ -1305,7 +1320,8 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline const ::SymbolRuleProto& symbol() const;
   inline ::SymbolRuleProto* mutable_symbol();
   inline ::SymbolRuleProto* release_symbol();
-  
+  inline void set_allocated_symbol(::SymbolRuleProto* symbol);
+
   // optional .CaptionRuleProto caption = 5;
   inline bool has_caption() const;
   inline void clear_caption();
@@ -1313,7 +1329,8 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline const ::CaptionRuleProto& caption() const;
   inline ::CaptionRuleProto* mutable_caption();
   inline ::CaptionRuleProto* release_caption();
-  
+  inline void set_allocated_caption(::CaptionRuleProto* caption);
+
   // optional .CircleRuleProto circle = 6;
   inline bool has_circle() const;
   inline void clear_circle();
@@ -1321,7 +1338,8 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline const ::CircleRuleProto& circle() const;
   inline ::CircleRuleProto* mutable_circle();
   inline ::CircleRuleProto* release_circle();
-  
+  inline void set_allocated_circle(::CircleRuleProto* circle);
+
   // optional .PathTextRuleProto path_text = 7;
   inline bool has_path_text() const;
   inline void clear_path_text();
@@ -1329,7 +1347,8 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline const ::PathTextRuleProto& path_text() const;
   inline ::PathTextRuleProto* mutable_path_text();
   inline ::PathTextRuleProto* release_path_text();
-  
+  inline void set_allocated_path_text(::PathTextRuleProto* path_text);
+
   // @@protoc_insertion_point(class_scope:DrawElementProto)
  private:
   inline void set_has_scale();
@@ -1344,9 +1363,9 @@ class DrawElementProto : public ::google::protobuf::Message {
   inline void clear_has_circle();
   inline void set_has_path_text();
   inline void clear_has_path_text();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::google::protobuf::RepeatedPtrField< ::LineRuleProto > lines_;
   ::AreaRuleProto* area_;
   ::SymbolRuleProto* symbol_;
@@ -1354,14 +1373,14 @@ class DrawElementProto : public ::google::protobuf::Message {
   ::CircleRuleProto* circle_;
   ::PathTextRuleProto* path_text_;
   ::google::protobuf::int32 scale_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static DrawElementProto* default_instance_;
 };
@@ -1371,29 +1390,29 @@ class ClassifElementProto : public ::google::protobuf::Message {
  public:
   ClassifElementProto();
   virtual ~ClassifElementProto();
-  
+
   ClassifElementProto(const ClassifElementProto& from);
-  
+
   inline ClassifElementProto& operator=(const ClassifElementProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const ClassifElementProto& default_instance();
-  
+
   void Swap(ClassifElementProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   ClassifElementProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -1401,7 +1420,7 @@ class ClassifElementProto : public ::google::protobuf::Message {
   void MergeFrom(const ClassifElementProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -1414,13 +1433,13 @@ class ClassifElementProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // required string name = 1;
   inline bool has_name() const;
   inline void clear_name();
@@ -1431,7 +1450,8 @@ class ClassifElementProto : public ::google::protobuf::Message {
   inline void set_name(const char* value, size_t size);
   inline ::std::string* mutable_name();
   inline ::std::string* release_name();
-  
+  inline void set_allocated_name(::std::string* name);
+
   // repeated .DrawElementProto element = 2;
   inline int element_size() const;
   inline void clear_element();
@@ -1443,24 +1463,24 @@ class ClassifElementProto : public ::google::protobuf::Message {
       element() const;
   inline ::google::protobuf::RepeatedPtrField< ::DrawElementProto >*
       mutable_element();
-  
+
   // @@protoc_insertion_point(class_scope:ClassifElementProto)
  private:
   inline void set_has_name();
   inline void clear_has_name();
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::std::string* name_;
   ::google::protobuf::RepeatedPtrField< ::DrawElementProto > element_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static ClassifElementProto* default_instance_;
 };
@@ -1470,29 +1490,29 @@ class ContainerProto : public ::google::protobuf::Message {
  public:
   ContainerProto();
   virtual ~ContainerProto();
-  
+
   ContainerProto(const ContainerProto& from);
-  
+
   inline ContainerProto& operator=(const ContainerProto& from) {
     CopyFrom(from);
     return *this;
   }
-  
+
   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();
   static const ContainerProto& default_instance();
-  
+
   void Swap(ContainerProto* other);
-  
+
   // implements Message ----------------------------------------------
-  
+
   ContainerProto* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
@@ -1500,7 +1520,7 @@ class ContainerProto : public ::google::protobuf::Message {
   void MergeFrom(const ContainerProto& from);
   void Clear();
   bool IsInitialized() const;
-  
+
   int ByteSize() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
@@ -1513,13 +1533,13 @@ class ContainerProto : public ::google::protobuf::Message {
   void SharedDtor();
   void SetCachedSize(int size) const;
   public:
-  
+
   ::google::protobuf::Metadata GetMetadata() const;
-  
+
   // nested types ----------------------------------------------------
-  
+
   // accessors -------------------------------------------------------
-  
+
   // repeated .ClassifElementProto cont = 1;
   inline int cont_size() const;
   inline void clear_cont();
@@ -1531,21 +1551,21 @@ class ContainerProto : public ::google::protobuf::Message {
       cont() const;
   inline ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >*
       mutable_cont();
-  
+
   // @@protoc_insertion_point(class_scope:ContainerProto)
  private:
-  
+
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  
+
   ::google::protobuf::RepeatedPtrField< ::ClassifElementProto > cont_;
-  
+
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
+
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
   friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
-  
+
   void InitAsDefaultInstance();
   static ContainerProto* default_instance_;
 };
@@ -1664,6 +1684,18 @@ inline ::std::string* PathSymProto::release_name() {
     return temp;
   }
 }
+inline void PathSymProto::set_allocated_name(::std::string* name) {
+  if (name_ != &::google::protobuf::internal::kEmptyString) {
+    delete name_;
+  }
+  if (name) {
+    set_has_name();
+    name_ = name;
+  } else {
+    clear_has_name();
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
 
 // required double step = 2;
 inline bool PathSymProto::has_step() const {
@@ -1785,6 +1817,15 @@ inline ::DashDotProto* LineRuleProto::release_dashdot() {
   dashdot_ = NULL;
   return temp;
 }
+inline void LineRuleProto::set_allocated_dashdot(::DashDotProto* dashdot) {
+  delete dashdot_;
+  dashdot_ = dashdot;
+  if (dashdot) {
+    set_has_dashdot();
+  } else {
+    clear_has_dashdot();
+  }
+}
 
 // required int32 priority = 4;
 inline bool LineRuleProto::has_priority() const {
@@ -1836,6 +1877,15 @@ inline ::PathSymProto* LineRuleProto::release_pathsym() {
   pathsym_ = NULL;
   return temp;
 }
+inline void LineRuleProto::set_allocated_pathsym(::PathSymProto* pathsym) {
+  delete pathsym_;
+  pathsym_ = pathsym;
+  if (pathsym) {
+    set_has_pathsym();
+  } else {
+    clear_has_pathsym();
+  }
+}
 
 // optional .LineJoin join = 6;
 inline bool LineRuleProto::has_join() const {
@@ -1851,11 +1901,11 @@ inline void LineRuleProto::clear_join() {
   join_ = 0;
   clear_has_join();
 }
-inline LineJoin LineRuleProto::join() const {
-  return static_cast< LineJoin >(join_);
+inline ::LineJoin LineRuleProto::join() const {
+  return static_cast< ::LineJoin >(join_);
 }
-inline void LineRuleProto::set_join(LineJoin value) {
-  GOOGLE_DCHECK(LineJoin_IsValid(value));
+inline void LineRuleProto::set_join(::LineJoin value) {
+  assert(::LineJoin_IsValid(value));
   set_has_join();
   join_ = value;
 }
@@ -1874,11 +1924,11 @@ inline void LineRuleProto::clear_cap() {
   cap_ = 0;
   clear_has_cap();
 }
-inline LineCap LineRuleProto::cap() const {
-  return static_cast< LineCap >(cap_);
+inline ::LineCap LineRuleProto::cap() const {
+  return static_cast< ::LineCap >(cap_);
 }
-inline void LineRuleProto::set_cap(LineCap value) {
-  GOOGLE_DCHECK(LineCap_IsValid(value));
+inline void LineRuleProto::set_cap(::LineCap value) {
+  assert(::LineCap_IsValid(value));
   set_has_cap();
   cap_ = value;
 }
@@ -1959,6 +2009,15 @@ inline ::DashDotProto* LineDefProto::release_dashdot() {
   dashdot_ = NULL;
   return temp;
 }
+inline void LineDefProto::set_allocated_dashdot(::DashDotProto* dashdot) {
+  delete dashdot_;
+  dashdot_ = dashdot;
+  if (dashdot) {
+    set_has_dashdot();
+  } else {
+    clear_has_dashdot();
+  }
+}
 
 // optional .PathSymProto pathsym = 4;
 inline bool LineDefProto::has_pathsym() const {
@@ -1988,6 +2047,15 @@ inline ::PathSymProto* LineDefProto::release_pathsym() {
   pathsym_ = NULL;
   return temp;
 }
+inline void LineDefProto::set_allocated_pathsym(::PathSymProto* pathsym) {
+  delete pathsym_;
+  pathsym_ = pathsym;
+  if (pathsym) {
+    set_has_pathsym();
+  } else {
+    clear_has_pathsym();
+  }
+}
 
 // optional .LineJoin join = 6;
 inline bool LineDefProto::has_join() const {
@@ -2003,11 +2071,11 @@ inline void LineDefProto::clear_join() {
   join_ = 0;
   clear_has_join();
 }
-inline LineJoin LineDefProto::join() const {
-  return static_cast< LineJoin >(join_);
+inline ::LineJoin LineDefProto::join() const {
+  return static_cast< ::LineJoin >(join_);
 }
-inline void LineDefProto::set_join(LineJoin value) {
-  GOOGLE_DCHECK(LineJoin_IsValid(value));
+inline void LineDefProto::set_join(::LineJoin value) {
+  assert(::LineJoin_IsValid(value));
   set_has_join();
   join_ = value;
 }
@@ -2026,11 +2094,11 @@ inline void LineDefProto::clear_cap() {
   cap_ = 0;
   clear_has_cap();
 }
-inline LineCap LineDefProto::cap() const {
-  return static_cast< LineCap >(cap_);
+inline ::LineCap LineDefProto::cap() const {
+  return static_cast< ::LineCap >(cap_);
 }
-inline void LineDefProto::set_cap(LineCap value) {
-  GOOGLE_DCHECK(LineCap_IsValid(value));
+inline void LineDefProto::set_cap(::LineCap value) {
+  assert(::LineCap_IsValid(value));
   set_has_cap();
   cap_ = value;
 }
@@ -2089,6 +2157,15 @@ inline ::LineDefProto* AreaRuleProto::release_border() {
   border_ = NULL;
   return temp;
 }
+inline void AreaRuleProto::set_allocated_border(::LineDefProto* border) {
+  delete border_;
+  border_ = border;
+  if (border) {
+    set_has_border();
+  } else {
+    clear_has_border();
+  }
+}
 
 // required int32 priority = 3;
 inline bool AreaRuleProto::has_priority() const {
@@ -2173,6 +2250,18 @@ inline ::std::string* SymbolRuleProto::release_name() {
     return temp;
   }
 }
+inline void SymbolRuleProto::set_allocated_name(::std::string* name) {
+  if (name_ != &::google::protobuf::internal::kEmptyString) {
+    delete name_;
+  }
+  if (name) {
+    set_has_name();
+    name_ = name;
+  } else {
+    clear_has_name();
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
 
 // optional int32 apply_for_type = 2;
 inline bool SymbolRuleProto::has_apply_for_type() const {
@@ -2364,6 +2453,15 @@ inline ::CaptionDefProto* CaptionRuleProto::release_primary() {
   primary_ = NULL;
   return temp;
 }
+inline void CaptionRuleProto::set_allocated_primary(::CaptionDefProto* primary) {
+  delete primary_;
+  primary_ = primary;
+  if (primary) {
+    set_has_primary();
+  } else {
+    clear_has_primary();
+  }
+}
 
 // optional .CaptionDefProto secondary = 2;
 inline bool CaptionRuleProto::has_secondary() const {
@@ -2393,6 +2491,15 @@ inline ::CaptionDefProto* CaptionRuleProto::release_secondary() {
   secondary_ = NULL;
   return temp;
 }
+inline void CaptionRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) {
+  delete secondary_;
+  secondary_ = secondary;
+  if (secondary) {
+    set_has_secondary();
+  } else {
+    clear_has_secondary();
+  }
+}
 
 // required int32 priority = 3;
 inline bool CaptionRuleProto::has_priority() const {
@@ -2492,6 +2599,15 @@ inline ::LineDefProto* CircleRuleProto::release_border() {
   border_ = NULL;
   return temp;
 }
+inline void CircleRuleProto::set_allocated_border(::LineDefProto* border) {
+  delete border_;
+  border_ = border;
+  if (border) {
+    set_has_border();
+  } else {
+    clear_has_border();
+  }
+}
 
 // required int32 priority = 4;
 inline bool CircleRuleProto::has_priority() const {
@@ -2547,6 +2663,15 @@ inline ::CaptionDefProto* PathTextRuleProto::release_primary() {
   primary_ = NULL;
   return temp;
 }
+inline void PathTextRuleProto::set_allocated_primary(::CaptionDefProto* primary) {
+  delete primary_;
+  primary_ = primary;
+  if (primary) {
+    set_has_primary();
+  } else {
+    clear_has_primary();
+  }
+}
 
 // optional .CaptionDefProto secondary = 2;
 inline bool PathTextRuleProto::has_secondary() const {
@@ -2576,6 +2701,15 @@ inline ::CaptionDefProto* PathTextRuleProto::release_secondary() {
   secondary_ = NULL;
   return temp;
 }
+inline void PathTextRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) {
+  delete secondary_;
+  secondary_ = secondary;
+  if (secondary) {
+    set_has_secondary();
+  } else {
+    clear_has_secondary();
+  }
+}
 
 // required int32 priority = 3;
 inline bool PathTextRuleProto::has_priority() const {
@@ -2678,6 +2812,15 @@ inline ::AreaRuleProto* DrawElementProto::release_area() {
   area_ = NULL;
   return temp;
 }
+inline void DrawElementProto::set_allocated_area(::AreaRuleProto* area) {
+  delete area_;
+  area_ = area;
+  if (area) {
+    set_has_area();
+  } else {
+    clear_has_area();
+  }
+}
 
 // optional .SymbolRuleProto symbol = 4;
 inline bool DrawElementProto::has_symbol() const {
@@ -2707,6 +2850,15 @@ inline ::SymbolRuleProto* DrawElementProto::release_symbol() {
   symbol_ = NULL;
   return temp;
 }
+inline void DrawElementProto::set_allocated_symbol(::SymbolRuleProto* symbol) {
+  delete symbol_;
+  symbol_ = symbol;
+  if (symbol) {
+    set_has_symbol();
+  } else {
+    clear_has_symbol();
+  }
+}
 
 // optional .CaptionRuleProto caption = 5;
 inline bool DrawElementProto::has_caption() const {
@@ -2736,6 +2888,15 @@ inline ::CaptionRuleProto* DrawElementProto::release_caption() {
   caption_ = NULL;
   return temp;
 }
+inline void DrawElementProto::set_allocated_caption(::CaptionRuleProto* caption) {
+  delete caption_;
+  caption_ = caption;
+  if (caption) {
+    set_has_caption();
+  } else {
+    clear_has_caption();
+  }
+}
 
 // optional .CircleRuleProto circle = 6;
 inline bool DrawElementProto::has_circle() const {
@@ -2765,6 +2926,15 @@ inline ::CircleRuleProto* DrawElementProto::release_circle() {
   circle_ = NULL;
   return temp;
 }
+inline void DrawElementProto::set_allocated_circle(::CircleRuleProto* circle) {
+  delete circle_;
+  circle_ = circle;
+  if (circle) {
+    set_has_circle();
+  } else {
+    clear_has_circle();
+  }
+}
 
 // optional .PathTextRuleProto path_text = 7;
 inline bool DrawElementProto::has_path_text() const {
@@ -2794,6 +2964,15 @@ inline ::PathTextRuleProto* DrawElementProto::release_path_text() {
   path_text_ = NULL;
   return temp;
 }
+inline void DrawElementProto::set_allocated_path_text(::PathTextRuleProto* path_text) {
+  delete path_text_;
+  path_text_ = path_text;
+  if (path_text) {
+    set_has_path_text();
+  } else {
+    clear_has_path_text();
+  }
+}
 
 // -------------------------------------------------------------------
 
@@ -2856,6 +3035,18 @@ inline ::std::string* ClassifElementProto::release_name() {
     return temp;
   }
 }
+inline void ClassifElementProto::set_allocated_name(::std::string* name) {
+  if (name_ != &::google::protobuf::internal::kEmptyString) {
+    delete name_;
+  }
+  if (name) {
+    set_has_name();
+    name_ = name;
+  } else {
+    clear_has_name();
+    name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
 
 // repeated .DrawElementProto element = 2;
 inline int ClassifElementProto::element_size() const {
@@ -2919,12 +3110,12 @@ namespace google {
 namespace protobuf {
 
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< LineJoin>() {
-  return LineJoin_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::LineJoin>() {
+  return ::LineJoin_descriptor();
 }
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< LineCap>() {
-  return LineCap_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::LineCap>() {
+  return ::LineCap_descriptor();
 }
 
 }  // namespace google