diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2013-03-15 14:57:46 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:51:43 +0300 |
| commit | 237bdfc855d55abf990953c5969251a1547252a9 (patch) | |
| tree | db5b84f0abf00f24abefc938644fa45cf6374951 /indexer | |
| parent | c216ba86d19348ec3c71f3733ea7f1a2bc29b47b (diff) | |
[3party] Updated protobuf to 2.5.0
Diffstat (limited to 'indexer')
| -rw-r--r-- | indexer/drules_struct.pb.cc | 503 | ||||
| -rw-r--r-- | indexer/drules_struct.pb.h | 819 | ||||
| -rw-r--r-- | indexer/drules_struct.proto | 3 | ||||
| -rw-r--r-- | indexer/drules_struct_lite.pb.cc | 597 | ||||
| -rw-r--r-- | indexer/drules_struct_lite.pb.h | 972 |
5 files changed, 1870 insertions, 1024 deletions
diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc index 0d838d627e..348c38e3ff 100644 --- a/indexer/drules_struct.pb.cc +++ b/indexer/drules_struct.pb.cc @@ -1,14 +1,17 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! +// source: drules_struct.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION #include "drules_struct.pb.h" #include <algorithm> +#include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/once.h> #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/wire_format_lite_inl.h> #include <google/protobuf/descriptor.h> +#include <google/protobuf/generated_message_reflection.h> #include <google/protobuf/reflection_ops.h> #include <google/protobuf/wire_format.h> // @@protoc_insertion_point(includes) @@ -452,7 +455,6 @@ struct StaticDescriptorInitializer_drules_5fstruct_2eproto { protobuf_AddDesc_drules_5fstruct_2eproto(); } } static_descriptor_initializer_drules_5fstruct_2eproto_; - const ::google::protobuf::EnumDescriptor* LineJoin_descriptor() { protobuf_AssignDescriptorsOnce(); return LineJoin_descriptor_; @@ -531,7 +533,8 @@ const ::google::protobuf::Descriptor* DashDotProto::descriptor() { } const DashDotProto& DashDotProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } DashDotProto* DashDotProto::default_instance_ = NULL; @@ -576,7 +579,7 @@ bool DashDotProto::MergePartialFromCodedStream( if (input->ExpectTag(17)) goto parse_offset; break; } - + // optional double offset = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -592,7 +595,7 @@ bool DashDotProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -616,12 +619,12 @@ void DashDotProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteDouble( 1, this->dd(i), output); } - + // optional double offset = 2; if (has_offset()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->offset(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -635,12 +638,12 @@ void DashDotProto::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite:: WriteDoubleToArray(1, this->dd(i), target); } - + // optional double offset = 2; if (has_offset()) { target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->offset(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -650,13 +653,13 @@ void DashDotProto::SerializeWithCachedSizes( int DashDotProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) { // optional double offset = 2; if (has_offset()) { total_size += 1 + 8; } - + } // repeated double dd = 1; { @@ -664,7 +667,7 @@ int DashDotProto::ByteSize() const { data_size = 8 * this->dd_size(); total_size += 1 * this->dd_size() + data_size; } - + if (!unknown_fields().empty()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( @@ -712,7 +715,7 @@ void DashDotProto::CopyFrom(const DashDotProto& from) { } bool DashDotProto::IsInitialized() const { - + return true; } @@ -788,7 +791,8 @@ const ::google::protobuf::Descriptor* PathSymProto::descriptor() { } const PathSymProto& PathSymProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } PathSymProto* PathSymProto::default_instance_ = NULL; @@ -832,7 +836,7 @@ bool PathSymProto::MergePartialFromCodedStream( if (input->ExpectTag(17)) goto parse_step; break; } - + // required double step = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -848,7 +852,7 @@ bool PathSymProto::MergePartialFromCodedStream( if (input->ExpectTag(25)) goto parse_offset; break; } - + // optional double offset = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -864,7 +868,7 @@ bool PathSymProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -891,17 +895,17 @@ void PathSymProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->name(), output); } - + // required double step = 2; if (has_step()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->step(), output); } - + // optional double offset = 3; if (has_offset()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->offset(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -919,17 +923,17 @@ void PathSymProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 1, this->name(), target); } - + // required double step = 2; if (has_step()) { target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->step(), target); } - + // optional double offset = 3; if (has_offset()) { target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(3, this->offset(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -939,7 +943,7 @@ void PathSymProto::SerializeWithCachedSizes( int PathSymProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required string name = 1; if (has_name()) { @@ -947,17 +951,17 @@ int PathSymProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::StringSize( this->name()); } - + // required double step = 2; if (has_step()) { total_size += 1 + 8; } - + // optional double offset = 3; if (has_offset()) { total_size += 1 + 8; } - + } if (!unknown_fields().empty()) { total_size += @@ -1012,7 +1016,7 @@ void PathSymProto::CopyFrom(const PathSymProto& from) { bool PathSymProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - + return true; } @@ -1098,7 +1102,8 @@ const ::google::protobuf::Descriptor* LineRuleProto::descriptor() { } const LineRuleProto& LineRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } LineRuleProto* LineRuleProto::default_instance_ = NULL; @@ -1145,7 +1150,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_color; break; } - + // required uint32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1161,7 +1166,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(26)) goto parse_dashdot; break; } - + // optional .DashDotProto dashdot = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1175,7 +1180,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(32)) goto parse_priority; break; } - + // required int32 priority = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1191,7 +1196,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(42)) goto parse_pathsym; break; } - + // optional .PathSymProto pathsym = 5; case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1205,7 +1210,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(48)) goto parse_join; break; } - + // optional .LineJoin join = 6; case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1215,8 +1220,8 @@ bool LineRuleProto::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (LineJoin_IsValid(value)) { - set_join(static_cast< LineJoin >(value)); + if (::LineJoin_IsValid(value)) { + set_join(static_cast< ::LineJoin >(value)); } else { mutable_unknown_fields()->AddVarint(6, value); } @@ -1226,7 +1231,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(56)) goto parse_cap; break; } - + // optional .LineCap cap = 7; case 7: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1236,8 +1241,8 @@ bool LineRuleProto::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (LineCap_IsValid(value)) { - set_cap(static_cast< LineCap >(value)); + if (::LineCap_IsValid(value)) { + set_cap(static_cast< ::LineCap >(value)); } else { mutable_unknown_fields()->AddVarint(7, value); } @@ -1247,7 +1252,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1270,41 +1275,41 @@ void LineRuleProto::SerializeWithCachedSizes( if (has_width()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output); } - + // required uint32 color = 2; if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->dashdot(), output); } - + // required int32 priority = 4; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); } - + // optional .PathSymProto pathsym = 5; if (has_pathsym()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->pathsym(), output); } - + // optional .LineJoin join = 6; if (has_join()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 6, this->join(), output); } - + // optional .LineCap cap = 7; if (has_cap()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 7, this->cap(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -1317,43 +1322,43 @@ void LineRuleProto::SerializeWithCachedSizes( if (has_width()) { target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->width(), target); } - + // required uint32 color = 2; if (has_color()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->dashdot(), target); } - + // required int32 priority = 4; if (has_priority()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->priority(), target); } - + // optional .PathSymProto pathsym = 5; if (has_pathsym()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 5, this->pathsym(), target); } - + // optional .LineJoin join = 6; if (has_join()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 6, this->join(), target); } - + // optional .LineCap cap = 7; if (has_cap()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 7, this->cap(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -1363,53 +1368,53 @@ void LineRuleProto::SerializeWithCachedSizes( int LineRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required double width = 1; if (has_width()) { total_size += 1 + 8; } - + // required uint32 color = 2; if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->dashdot()); } - + // required int32 priority = 4; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + // optional .PathSymProto pathsym = 5; if (has_pathsym()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pathsym()); } - + // optional .LineJoin join = 6; if (has_join()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->join()); } - + // optional .LineCap cap = 7; if (has_cap()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->cap()); } - + } if (!unknown_fields().empty()) { total_size += @@ -1476,7 +1481,7 @@ void LineRuleProto::CopyFrom(const LineRuleProto& from) { bool LineRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false; - + if (has_pathsym()) { if (!this->pathsym().IsInitialized()) return false; } @@ -1567,7 +1572,8 @@ const ::google::protobuf::Descriptor* LineDefProto::descriptor() { } const LineDefProto& LineDefProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } LineDefProto* LineDefProto::default_instance_ = NULL; @@ -1613,7 +1619,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_color; break; } - + // required uint32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1629,7 +1635,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(26)) goto parse_dashdot; break; } - + // optional .DashDotProto dashdot = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1643,7 +1649,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(34)) goto parse_pathsym; break; } - + // optional .PathSymProto pathsym = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1657,7 +1663,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(48)) goto parse_join; break; } - + // optional .LineJoin join = 6; case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1667,8 +1673,8 @@ bool LineDefProto::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (LineJoin_IsValid(value)) { - set_join(static_cast< LineJoin >(value)); + if (::LineJoin_IsValid(value)) { + set_join(static_cast< ::LineJoin >(value)); } else { mutable_unknown_fields()->AddVarint(6, value); } @@ -1678,7 +1684,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(56)) goto parse_cap; break; } - + // optional .LineCap cap = 7; case 7: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1688,8 +1694,8 @@ bool LineDefProto::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (LineCap_IsValid(value)) { - set_cap(static_cast< LineCap >(value)); + if (::LineCap_IsValid(value)) { + set_cap(static_cast< ::LineCap >(value)); } else { mutable_unknown_fields()->AddVarint(7, value); } @@ -1699,7 +1705,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1722,36 +1728,36 @@ void LineDefProto::SerializeWithCachedSizes( if (has_width()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output); } - + // required uint32 color = 2; if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->dashdot(), output); } - + // optional .PathSymProto pathsym = 4; if (has_pathsym()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->pathsym(), output); } - + // optional .LineJoin join = 6; if (has_join()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 6, this->join(), output); } - + // optional .LineCap cap = 7; if (has_cap()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 7, this->cap(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -1764,38 +1770,38 @@ void LineDefProto::SerializeWithCachedSizes( if (has_width()) { target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->width(), target); } - + // required uint32 color = 2; if (has_color()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->dashdot(), target); } - + // optional .PathSymProto pathsym = 4; if (has_pathsym()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->pathsym(), target); } - + // optional .LineJoin join = 6; if (has_join()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 6, this->join(), target); } - + // optional .LineCap cap = 7; if (has_cap()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 7, this->cap(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -1805,46 +1811,46 @@ void LineDefProto::SerializeWithCachedSizes( int LineDefProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required double width = 1; if (has_width()) { total_size += 1 + 8; } - + // required uint32 color = 2; if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->dashdot()); } - + // optional .PathSymProto pathsym = 4; if (has_pathsym()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pathsym()); } - + // optional .LineJoin join = 6; if (has_join()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->join()); } - + // optional .LineCap cap = 7; if (has_cap()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->cap()); } - + } if (!unknown_fields().empty()) { total_size += @@ -1908,7 +1914,7 @@ void LineDefProto::CopyFrom(const LineDefProto& from) { bool LineDefProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - + if (has_pathsym()) { if (!this->pathsym().IsInitialized()) return false; } @@ -1990,7 +1996,8 @@ const ::google::protobuf::Descriptor* AreaRuleProto::descriptor() { } const AreaRuleProto& AreaRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } AreaRuleProto* AreaRuleProto::default_instance_ = NULL; @@ -2031,7 +2038,7 @@ bool AreaRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_border; break; } - + // optional .LineDefProto border = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2045,7 +2052,7 @@ bool AreaRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_priority; break; } - + // required int32 priority = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2061,7 +2068,7 @@ bool AreaRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2084,18 +2091,18 @@ void AreaRuleProto::SerializeWithCachedSizes( if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->color(), output); } - + // optional .LineDefProto border = 2; if (has_border()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->border(), output); } - + // required int32 priority = 3; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -2108,19 +2115,19 @@ void AreaRuleProto::SerializeWithCachedSizes( if (has_color()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->color(), target); } - + // optional .LineDefProto border = 2; if (has_border()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->border(), target); } - + // required int32 priority = 3; if (has_priority()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -2130,7 +2137,7 @@ void AreaRuleProto::SerializeWithCachedSizes( int AreaRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required uint32 color = 1; if (has_color()) { @@ -2138,21 +2145,21 @@ int AreaRuleProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional .LineDefProto border = 2; if (has_border()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->border()); } - + // required int32 priority = 3; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } if (!unknown_fields().empty()) { total_size += @@ -2207,7 +2214,7 @@ void AreaRuleProto::CopyFrom(const AreaRuleProto& from) { bool AreaRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false; - + if (has_border()) { if (!this->border().IsInitialized()) return false; } @@ -2287,7 +2294,8 @@ const ::google::protobuf::Descriptor* SymbolRuleProto::descriptor() { } const SymbolRuleProto& SymbolRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } SymbolRuleProto* SymbolRuleProto::default_instance_ = NULL; @@ -2331,7 +2339,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_apply_for_type; break; } - + // optional int32 apply_for_type = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2347,7 +2355,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_priority; break; } - + // required int32 priority = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2363,7 +2371,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2390,17 +2398,17 @@ void SymbolRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->name(), output); } - + // optional int32 apply_for_type = 2; if (has_apply_for_type()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->apply_for_type(), output); } - + // required int32 priority = 3; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -2418,17 +2426,17 @@ void SymbolRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 1, this->name(), target); } - + // optional int32 apply_for_type = 2; if (has_apply_for_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->apply_for_type(), target); } - + // required int32 priority = 3; if (has_priority()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -2438,7 +2446,7 @@ void SymbolRuleProto::SerializeWithCachedSizes( int SymbolRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required string name = 1; if (has_name()) { @@ -2446,21 +2454,21 @@ int SymbolRuleProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::StringSize( this->name()); } - + // optional int32 apply_for_type = 2; if (has_apply_for_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->apply_for_type()); } - + // required int32 priority = 3; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } if (!unknown_fields().empty()) { total_size += @@ -2515,7 +2523,7 @@ void SymbolRuleProto::CopyFrom(const SymbolRuleProto& from) { bool SymbolRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false; - + return true; } @@ -2593,7 +2601,8 @@ const ::google::protobuf::Descriptor* CaptionDefProto::descriptor() { } const CaptionDefProto& CaptionDefProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } CaptionDefProto* CaptionDefProto::default_instance_ = NULL; @@ -2634,7 +2643,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_color; break; } - + // required uint32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2650,7 +2659,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_stroke_color; break; } - + // optional uint32 stroke_color = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2666,7 +2675,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectTag(32)) goto parse_offset_x; break; } - + // optional int32 offset_x = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2682,7 +2691,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectTag(40)) goto parse_offset_y; break; } - + // optional int32 offset_y = 5; case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2698,7 +2707,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2721,27 +2730,27 @@ void CaptionDefProto::SerializeWithCachedSizes( if (has_height()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output); } - + // required uint32 color = 2; if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); } - + // optional uint32 stroke_color = 3; if (has_stroke_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output); } - + // optional int32 offset_x = 4; if (has_offset_x()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->offset_x(), output); } - + // optional int32 offset_y = 5; if (has_offset_y()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->offset_y(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -2754,27 +2763,27 @@ void CaptionDefProto::SerializeWithCachedSizes( if (has_height()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->height(), target); } - + // required uint32 color = 2; if (has_color()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target); } - + // optional uint32 stroke_color = 3; if (has_stroke_color()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->stroke_color(), target); } - + // optional int32 offset_x = 4; if (has_offset_x()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->offset_x(), target); } - + // optional int32 offset_y = 5; if (has_offset_y()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->offset_y(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -2784,7 +2793,7 @@ void CaptionDefProto::SerializeWithCachedSizes( int CaptionDefProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required int32 height = 1; if (has_height()) { @@ -2792,35 +2801,35 @@ int CaptionDefProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::Int32Size( this->height()); } - + // required uint32 color = 2; if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional uint32 stroke_color = 3; if (has_stroke_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->stroke_color()); } - + // optional int32 offset_x = 4; if (has_offset_x()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->offset_x()); } - + // optional int32 offset_y = 5; if (has_offset_y()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->offset_y()); } - + } if (!unknown_fields().empty()) { total_size += @@ -2881,7 +2890,7 @@ void CaptionDefProto::CopyFrom(const CaptionDefProto& from) { bool CaptionDefProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - + return true; } @@ -2961,7 +2970,8 @@ const ::google::protobuf::Descriptor* CaptionRuleProto::descriptor() { } const CaptionRuleProto& CaptionRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } CaptionRuleProto* CaptionRuleProto::default_instance_ = NULL; @@ -3002,7 +3012,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_secondary; break; } - + // optional .CaptionDefProto secondary = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3016,7 +3026,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_priority; break; } - + // required int32 priority = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3032,7 +3042,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3056,18 +3066,18 @@ void CaptionRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->primary(), output); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->secondary(), output); } - + // required int32 priority = 3; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -3082,19 +3092,19 @@ void CaptionRuleProto::SerializeWithCachedSizes( WriteMessageNoVirtualToArray( 1, this->primary(), target); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->secondary(), target); } - + // required int32 priority = 3; if (has_priority()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -3104,7 +3114,7 @@ void CaptionRuleProto::SerializeWithCachedSizes( int CaptionRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required .CaptionDefProto primary = 1; if (has_primary()) { @@ -3112,21 +3122,21 @@ int CaptionRuleProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->primary()); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->secondary()); } - + // required int32 priority = 3; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } if (!unknown_fields().empty()) { total_size += @@ -3181,7 +3191,7 @@ void CaptionRuleProto::CopyFrom(const CaptionRuleProto& from) { bool CaptionRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false; - + if (has_primary()) { if (!this->primary().IsInitialized()) return false; } @@ -3265,7 +3275,8 @@ const ::google::protobuf::Descriptor* CircleRuleProto::descriptor() { } const CircleRuleProto& CircleRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } CircleRuleProto* CircleRuleProto::default_instance_ = NULL; @@ -3307,7 +3318,7 @@ bool CircleRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_color; break; } - + // required uint32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3323,7 +3334,7 @@ bool CircleRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(26)) goto parse_border; break; } - + // optional .LineDefProto border = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3337,7 +3348,7 @@ bool CircleRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(32)) goto parse_priority; break; } - + // required int32 priority = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3353,7 +3364,7 @@ bool CircleRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3376,23 +3387,23 @@ void CircleRuleProto::SerializeWithCachedSizes( if (has_radius()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->radius(), output); } - + // required uint32 color = 2; if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); } - + // optional .LineDefProto border = 3; if (has_border()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->border(), output); } - + // required int32 priority = 4; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -3405,24 +3416,24 @@ void CircleRuleProto::SerializeWithCachedSizes( if (has_radius()) { target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->radius(), target); } - + // required uint32 color = 2; if (has_color()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target); } - + // optional .LineDefProto border = 3; if (has_border()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->border(), target); } - + // required int32 priority = 4; if (has_priority()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->priority(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -3432,34 +3443,34 @@ void CircleRuleProto::SerializeWithCachedSizes( int CircleRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required double radius = 1; if (has_radius()) { total_size += 1 + 8; } - + // required uint32 color = 2; if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional .LineDefProto border = 3; if (has_border()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->border()); } - + // required int32 priority = 4; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } if (!unknown_fields().empty()) { total_size += @@ -3517,7 +3528,7 @@ void CircleRuleProto::CopyFrom(const CircleRuleProto& from) { bool CircleRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false; - + if (has_border()) { if (!this->border().IsInitialized()) return false; } @@ -3599,7 +3610,8 @@ const ::google::protobuf::Descriptor* PathTextRuleProto::descriptor() { } const PathTextRuleProto& PathTextRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } PathTextRuleProto* PathTextRuleProto::default_instance_ = NULL; @@ -3640,7 +3652,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_secondary; break; } - + // optional .CaptionDefProto secondary = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3654,7 +3666,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_priority; break; } - + // required int32 priority = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3670,7 +3682,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3694,18 +3706,18 @@ void PathTextRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->primary(), output); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->secondary(), output); } - + // required int32 priority = 3; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -3720,19 +3732,19 @@ void PathTextRuleProto::SerializeWithCachedSizes( WriteMessageNoVirtualToArray( 1, this->primary(), target); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->secondary(), target); } - + // required int32 priority = 3; if (has_priority()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -3742,7 +3754,7 @@ void PathTextRuleProto::SerializeWithCachedSizes( int PathTextRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required .CaptionDefProto primary = 1; if (has_primary()) { @@ -3750,21 +3762,21 @@ int PathTextRuleProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->primary()); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->secondary()); } - + // required int32 priority = 3; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } if (!unknown_fields().empty()) { total_size += @@ -3819,7 +3831,7 @@ void PathTextRuleProto::CopyFrom(const PathTextRuleProto& from) { bool PathTextRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false; - + if (has_primary()) { if (!this->primary().IsInitialized()) return false; } @@ -3916,7 +3928,8 @@ const ::google::protobuf::Descriptor* DrawElementProto::descriptor() { } const DrawElementProto& DrawElementProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } DrawElementProto* DrawElementProto::default_instance_ = NULL; @@ -3969,7 +3982,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_lines; break; } - + // repeated .LineRuleProto lines = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3984,7 +3997,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(26)) goto parse_area; break; } - + // optional .AreaRuleProto area = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3998,7 +4011,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(34)) goto parse_symbol; break; } - + // optional .SymbolRuleProto symbol = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -4012,7 +4025,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(42)) goto parse_caption; break; } - + // optional .CaptionRuleProto caption = 5; case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -4026,7 +4039,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(50)) goto parse_circle; break; } - + // optional .CircleRuleProto circle = 6; case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -4040,7 +4053,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(58)) goto parse_path_text; break; } - + // optional .PathTextRuleProto path_text = 7; case 7: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -4054,7 +4067,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -4077,43 +4090,43 @@ void DrawElementProto::SerializeWithCachedSizes( if (has_scale()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->scale(), output); } - + // repeated .LineRuleProto lines = 2; for (int i = 0; i < this->lines_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->lines(i), output); } - + // optional .AreaRuleProto area = 3; if (has_area()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->area(), output); } - + // optional .SymbolRuleProto symbol = 4; if (has_symbol()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->symbol(), output); } - + // optional .CaptionRuleProto caption = 5; if (has_caption()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->caption(), output); } - + // optional .CircleRuleProto circle = 6; if (has_circle()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->circle(), output); } - + // optional .PathTextRuleProto path_text = 7; if (has_path_text()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 7, this->path_text(), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -4126,49 +4139,49 @@ void DrawElementProto::SerializeWithCachedSizes( if (has_scale()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->scale(), target); } - + // repeated .LineRuleProto lines = 2; for (int i = 0; i < this->lines_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->lines(i), target); } - + // optional .AreaRuleProto area = 3; if (has_area()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->area(), target); } - + // optional .SymbolRuleProto symbol = 4; if (has_symbol()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->symbol(), target); } - + // optional .CaptionRuleProto caption = 5; if (has_caption()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 5, this->caption(), target); } - + // optional .CircleRuleProto circle = 6; if (has_circle()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 6, this->circle(), target); } - + // optional .PathTextRuleProto path_text = 7; if (has_path_text()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 7, this->path_text(), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -4178,7 +4191,7 @@ void DrawElementProto::SerializeWithCachedSizes( int DrawElementProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required int32 scale = 1; if (has_scale()) { @@ -4186,42 +4199,42 @@ int DrawElementProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::Int32Size( this->scale()); } - + // optional .AreaRuleProto area = 3; if (has_area()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->area()); } - + // optional .SymbolRuleProto symbol = 4; if (has_symbol()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->symbol()); } - + // optional .CaptionRuleProto caption = 5; if (has_caption()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->caption()); } - + // optional .CircleRuleProto circle = 6; if (has_circle()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->circle()); } - + // optional .PathTextRuleProto path_text = 7; if (has_path_text()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->path_text()); } - + } // repeated .LineRuleProto lines = 2; total_size += 1 * this->lines_size(); @@ -4230,7 +4243,7 @@ int DrawElementProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->lines(i)); } - + if (!unknown_fields().empty()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( @@ -4294,7 +4307,7 @@ void DrawElementProto::CopyFrom(const DrawElementProto& from) { bool DrawElementProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - + for (int i = 0; i < lines_size(); i++) { if (!this->lines(i).IsInitialized()) return false; } @@ -4390,7 +4403,8 @@ const ::google::protobuf::Descriptor* ClassifElementProto::descriptor() { } const ClassifElementProto& ClassifElementProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } ClassifElementProto* ClassifElementProto::default_instance_ = NULL; @@ -4433,7 +4447,7 @@ bool ClassifElementProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_element; break; } - + // repeated .DrawElementProto element = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -4448,7 +4462,7 @@ bool ClassifElementProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -4475,13 +4489,13 @@ void ClassifElementProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->name(), output); } - + // repeated .DrawElementProto element = 2; for (int i = 0; i < this->element_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->element(i), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -4499,14 +4513,14 @@ void ClassifElementProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 1, this->name(), target); } - + // repeated .DrawElementProto element = 2; for (int i = 0; i < this->element_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->element(i), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -4516,7 +4530,7 @@ void ClassifElementProto::SerializeWithCachedSizes( int ClassifElementProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required string name = 1; if (has_name()) { @@ -4524,7 +4538,7 @@ int ClassifElementProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::StringSize( this->name()); } - + } // repeated .DrawElementProto element = 2; total_size += 1 * this->element_size(); @@ -4533,7 +4547,7 @@ int ClassifElementProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->element(i)); } - + if (!unknown_fields().empty()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( @@ -4582,7 +4596,7 @@ void ClassifElementProto::CopyFrom(const ClassifElementProto& from) { bool ClassifElementProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - + for (int i = 0; i < element_size(); i++) { if (!this->element(i).IsInitialized()) return false; } @@ -4653,7 +4667,8 @@ const ::google::protobuf::Descriptor* ContainerProto::descriptor() { } const ContainerProto& ContainerProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); + return *default_instance_; } ContainerProto* ContainerProto::default_instance_ = NULL; @@ -4688,7 +4703,7 @@ bool ContainerProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -4712,7 +4727,7 @@ void ContainerProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->cont(i), output); } - + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -4727,7 +4742,7 @@ void ContainerProto::SerializeWithCachedSizes( WriteMessageNoVirtualToArray( 1, this->cont(i), target); } - + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -4737,7 +4752,7 @@ void ContainerProto::SerializeWithCachedSizes( int ContainerProto::ByteSize() const { int total_size = 0; - + // repeated .ClassifElementProto cont = 1; total_size += 1 * this->cont_size(); for (int i = 0; i < this->cont_size(); i++) { @@ -4745,7 +4760,7 @@ int ContainerProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->cont(i)); } - + if (!unknown_fields().empty()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( @@ -4788,7 +4803,7 @@ void ContainerProto::CopyFrom(const ContainerProto& from) { } bool ContainerProto::IsInitialized() const { - + for (int i = 0; i < cont_size(); i++) { if (!this->cont(i).IsInitialized()) return false; } 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 diff --git a/indexer/drules_struct.proto b/indexer/drules_struct.proto index 6e7c33c55c..15f47bd0bf 100644 --- a/indexer/drules_struct.proto +++ b/indexer/drules_struct.proto @@ -1,4 +1,5 @@ -option optimize_for = LITE_RUNTIME; +// To generate LITE version uncomment line below +//option optimize_for = LITE_RUNTIME; message DashDotProto { diff --git a/indexer/drules_struct_lite.pb.cc b/indexer/drules_struct_lite.pb.cc index 5b4384e963..6a2733a2d7 100644 --- a/indexer/drules_struct_lite.pb.cc +++ b/indexer/drules_struct_lite.pb.cc @@ -1,10 +1,12 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! +// source: drules_struct.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION #include "drules_struct_lite.pb.h" #include <algorithm> +#include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/once.h> #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/wire_format_lite_inl.h> @@ -26,12 +28,18 @@ void protobuf_ShutdownFile_drules_5fstruct_2eproto() { delete ContainerProto::default_instance_; } +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER +void protobuf_AddDesc_drules_5fstruct_2eproto_impl() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + +#else void protobuf_AddDesc_drules_5fstruct_2eproto() { static bool already_here = false; if (already_here) return; already_here = true; GOOGLE_PROTOBUF_VERIFY_VERSION; +#endif DashDotProto::default_instance_ = new DashDotProto(); PathSymProto::default_instance_ = new PathSymProto(); LineRuleProto::default_instance_ = new LineRuleProto(); @@ -61,13 +69,20 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() { ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_drules_5fstruct_2eproto); } +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER +GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_drules_5fstruct_2eproto_once_); +void protobuf_AddDesc_drules_5fstruct_2eproto() { + ::google::protobuf::::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_drules_5fstruct_2eproto_once_, + &protobuf_AddDesc_drules_5fstruct_2eproto_impl); +} +#else // Force AddDescriptors() to be called at static initialization time. struct StaticDescriptorInitializer_drules_5fstruct_2eproto { StaticDescriptorInitializer_drules_5fstruct_2eproto() { protobuf_AddDesc_drules_5fstruct_2eproto(); } } static_descriptor_initializer_drules_5fstruct_2eproto_; - +#endif bool LineJoin_IsValid(int value) { switch(value) { case 0: @@ -123,7 +138,11 @@ DashDotProto::~DashDotProto() { } void DashDotProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif } } @@ -133,7 +152,12 @@ void DashDotProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const DashDotProto& DashDotProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } DashDotProto* DashDotProto::default_instance_ = NULL; @@ -177,7 +201,7 @@ bool DashDotProto::MergePartialFromCodedStream( if (input->ExpectTag(17)) goto parse_offset; break; } - + // optional double offset = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -193,7 +217,7 @@ bool DashDotProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -216,23 +240,23 @@ void DashDotProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteDouble( 1, this->dd(i), output); } - + // optional double offset = 2; if (has_offset()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->offset(), output); } - + } int DashDotProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) { // optional double offset = 2; if (has_offset()) { total_size += 1 + 8; } - + } // repeated double dd = 1; { @@ -240,7 +264,7 @@ int DashDotProto::ByteSize() const { data_size = 8 * this->dd_size(); total_size += 1 * this->dd_size() + data_size; } - + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); @@ -269,7 +293,7 @@ void DashDotProto::CopyFrom(const DashDotProto& from) { } bool DashDotProto::IsInitialized() const { - + return true; } @@ -325,7 +349,11 @@ void PathSymProto::SharedDtor() { if (name_ != &::google::protobuf::internal::kEmptyString) { delete name_; } + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif } } @@ -335,7 +363,12 @@ void PathSymProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const PathSymProto& PathSymProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } PathSymProto* PathSymProto::default_instance_ = NULL; @@ -375,7 +408,7 @@ bool PathSymProto::MergePartialFromCodedStream( if (input->ExpectTag(17)) goto parse_step; break; } - + // required double step = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -391,7 +424,7 @@ bool PathSymProto::MergePartialFromCodedStream( if (input->ExpectTag(25)) goto parse_offset; break; } - + // optional double offset = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -407,7 +440,7 @@ bool PathSymProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -430,22 +463,22 @@ void PathSymProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->name(), output); } - + // required double step = 2; if (has_step()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->step(), output); } - + // optional double offset = 3; if (has_offset()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->offset(), output); } - + } int PathSymProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required string name = 1; if (has_name()) { @@ -453,17 +486,17 @@ int PathSymProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::StringSize( this->name()); } - + // required double step = 2; if (has_step()) { total_size += 1 + 8; } - + // optional double offset = 3; if (has_offset()) { total_size += 1 + 8; } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -499,7 +532,7 @@ void PathSymProto::CopyFrom(const PathSymProto& from) { bool PathSymProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - + return true; } @@ -536,8 +569,18 @@ LineRuleProto::LineRuleProto() } void LineRuleProto::InitAsDefaultInstance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + dashdot_ = const_cast< ::DashDotProto*>( + ::DashDotProto::internal_default_instance()); +#else dashdot_ = const_cast< ::DashDotProto*>(&::DashDotProto::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + pathsym_ = const_cast< ::PathSymProto*>( + ::PathSymProto::internal_default_instance()); +#else pathsym_ = const_cast< ::PathSymProto*>(&::PathSymProto::default_instance()); +#endif } LineRuleProto::LineRuleProto(const LineRuleProto& from) @@ -563,7 +606,11 @@ LineRuleProto::~LineRuleProto() { } void LineRuleProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif delete dashdot_; delete pathsym_; } @@ -575,7 +622,12 @@ void LineRuleProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const LineRuleProto& LineRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } LineRuleProto* LineRuleProto::default_instance_ = NULL; @@ -621,7 +673,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_color; break; } - + // required uint32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -637,7 +689,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(26)) goto parse_dashdot; break; } - + // optional .DashDotProto dashdot = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -651,7 +703,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(32)) goto parse_priority; break; } - + // required int32 priority = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -667,7 +719,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(42)) goto parse_pathsym; break; } - + // optional .PathSymProto pathsym = 5; case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -681,7 +733,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(48)) goto parse_join; break; } - + // optional .LineJoin join = 6; case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -691,8 +743,8 @@ bool LineRuleProto::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (LineJoin_IsValid(value)) { - set_join(static_cast< LineJoin >(value)); + if (::LineJoin_IsValid(value)) { + set_join(static_cast< ::LineJoin >(value)); } } else { goto handle_uninterpreted; @@ -700,7 +752,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(56)) goto parse_cap; break; } - + // optional .LineCap cap = 7; case 7: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -710,8 +762,8 @@ bool LineRuleProto::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (LineCap_IsValid(value)) { - set_cap(static_cast< LineCap >(value)); + if (::LineCap_IsValid(value)) { + set_cap(static_cast< ::LineCap >(value)); } } else { goto handle_uninterpreted; @@ -719,7 +771,7 @@ bool LineRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -741,92 +793,92 @@ void LineRuleProto::SerializeWithCachedSizes( if (has_width()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output); } - + // required uint32 color = 2; if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 3, this->dashdot(), output); } - + // required int32 priority = 4; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); } - + // optional .PathSymProto pathsym = 5; if (has_pathsym()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 5, this->pathsym(), output); } - + // optional .LineJoin join = 6; if (has_join()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 6, this->join(), output); } - + // optional .LineCap cap = 7; if (has_cap()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 7, this->cap(), output); } - + } int LineRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required double width = 1; if (has_width()) { total_size += 1 + 8; } - + // required uint32 color = 2; if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->dashdot()); } - + // required int32 priority = 4; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + // optional .PathSymProto pathsym = 5; if (has_pathsym()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pathsym()); } - + // optional .LineJoin join = 6; if (has_join()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->join()); } - + // optional .LineCap cap = 7; if (has_cap()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->cap()); } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -874,7 +926,7 @@ void LineRuleProto::CopyFrom(const LineRuleProto& from) { bool LineRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false; - + if (has_pathsym()) { if (!this->pathsym().IsInitialized()) return false; } @@ -917,8 +969,18 @@ LineDefProto::LineDefProto() } void LineDefProto::InitAsDefaultInstance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + dashdot_ = const_cast< ::DashDotProto*>( + ::DashDotProto::internal_default_instance()); +#else dashdot_ = const_cast< ::DashDotProto*>(&::DashDotProto::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + pathsym_ = const_cast< ::PathSymProto*>( + ::PathSymProto::internal_default_instance()); +#else pathsym_ = const_cast< ::PathSymProto*>(&::PathSymProto::default_instance()); +#endif } LineDefProto::LineDefProto(const LineDefProto& from) @@ -943,7 +1005,11 @@ LineDefProto::~LineDefProto() { } void LineDefProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif delete dashdot_; delete pathsym_; } @@ -955,7 +1021,12 @@ void LineDefProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const LineDefProto& LineDefProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } LineDefProto* LineDefProto::default_instance_ = NULL; @@ -1000,7 +1071,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_color; break; } - + // required uint32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1016,7 +1087,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(26)) goto parse_dashdot; break; } - + // optional .DashDotProto dashdot = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1030,7 +1101,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(34)) goto parse_pathsym; break; } - + // optional .PathSymProto pathsym = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1044,7 +1115,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(48)) goto parse_join; break; } - + // optional .LineJoin join = 6; case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1054,8 +1125,8 @@ bool LineDefProto::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (LineJoin_IsValid(value)) { - set_join(static_cast< LineJoin >(value)); + if (::LineJoin_IsValid(value)) { + set_join(static_cast< ::LineJoin >(value)); } } else { goto handle_uninterpreted; @@ -1063,7 +1134,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectTag(56)) goto parse_cap; break; } - + // optional .LineCap cap = 7; case 7: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1073,8 +1144,8 @@ bool LineDefProto::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (LineCap_IsValid(value)) { - set_cap(static_cast< LineCap >(value)); + if (::LineCap_IsValid(value)) { + set_cap(static_cast< ::LineCap >(value)); } } else { goto handle_uninterpreted; @@ -1082,7 +1153,7 @@ bool LineDefProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1104,80 +1175,80 @@ void LineDefProto::SerializeWithCachedSizes( if (has_width()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output); } - + // required uint32 color = 2; if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 3, this->dashdot(), output); } - + // optional .PathSymProto pathsym = 4; if (has_pathsym()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 4, this->pathsym(), output); } - + // optional .LineJoin join = 6; if (has_join()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 6, this->join(), output); } - + // optional .LineCap cap = 7; if (has_cap()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 7, this->cap(), output); } - + } int LineDefProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required double width = 1; if (has_width()) { total_size += 1 + 8; } - + // required uint32 color = 2; if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional .DashDotProto dashdot = 3; if (has_dashdot()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->dashdot()); } - + // optional .PathSymProto pathsym = 4; if (has_pathsym()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pathsym()); } - + // optional .LineJoin join = 6; if (has_join()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->join()); } - + // optional .LineCap cap = 7; if (has_cap()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->cap()); } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -1222,7 +1293,7 @@ void LineDefProto::CopyFrom(const LineDefProto& from) { bool LineDefProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - + if (has_pathsym()) { if (!this->pathsym().IsInitialized()) return false; } @@ -1261,7 +1332,12 @@ AreaRuleProto::AreaRuleProto() } void AreaRuleProto::InitAsDefaultInstance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + border_ = const_cast< ::LineDefProto*>( + ::LineDefProto::internal_default_instance()); +#else border_ = const_cast< ::LineDefProto*>(&::LineDefProto::default_instance()); +#endif } AreaRuleProto::AreaRuleProto(const AreaRuleProto& from) @@ -1283,7 +1359,11 @@ AreaRuleProto::~AreaRuleProto() { } void AreaRuleProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif delete border_; } } @@ -1294,7 +1374,12 @@ void AreaRuleProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const AreaRuleProto& AreaRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } AreaRuleProto* AreaRuleProto::default_instance_ = NULL; @@ -1334,7 +1419,7 @@ bool AreaRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_border; break; } - + // optional .LineDefProto border = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1348,7 +1433,7 @@ bool AreaRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_priority; break; } - + // required int32 priority = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1364,7 +1449,7 @@ bool AreaRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1386,23 +1471,23 @@ void AreaRuleProto::SerializeWithCachedSizes( if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->color(), output); } - + // optional .LineDefProto border = 2; if (has_border()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 2, this->border(), output); } - + // required int32 priority = 3; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); } - + } int AreaRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required uint32 color = 1; if (has_color()) { @@ -1410,21 +1495,21 @@ int AreaRuleProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional .LineDefProto border = 2; if (has_border()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->border()); } - + // required int32 priority = 3; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -1460,7 +1545,7 @@ void AreaRuleProto::CopyFrom(const AreaRuleProto& from) { bool AreaRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false; - + if (has_border()) { if (!this->border().IsInitialized()) return false; } @@ -1520,7 +1605,11 @@ void SymbolRuleProto::SharedDtor() { if (name_ != &::google::protobuf::internal::kEmptyString) { delete name_; } + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif } } @@ -1530,7 +1619,12 @@ void SymbolRuleProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const SymbolRuleProto& SymbolRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } SymbolRuleProto* SymbolRuleProto::default_instance_ = NULL; @@ -1570,7 +1664,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_apply_for_type; break; } - + // optional int32 apply_for_type = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1586,7 +1680,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_priority; break; } - + // required int32 priority = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1602,7 +1696,7 @@ bool SymbolRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1625,22 +1719,22 @@ void SymbolRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->name(), output); } - + // optional int32 apply_for_type = 2; if (has_apply_for_type()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->apply_for_type(), output); } - + // required int32 priority = 3; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); } - + } int SymbolRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required string name = 1; if (has_name()) { @@ -1648,21 +1742,21 @@ int SymbolRuleProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::StringSize( this->name()); } - + // optional int32 apply_for_type = 2; if (has_apply_for_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->apply_for_type()); } - + // required int32 priority = 3; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -1698,7 +1792,7 @@ void SymbolRuleProto::CopyFrom(const SymbolRuleProto& from) { bool SymbolRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false; - + return true; } @@ -1756,7 +1850,11 @@ CaptionDefProto::~CaptionDefProto() { } void CaptionDefProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif } } @@ -1766,7 +1864,12 @@ void CaptionDefProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const CaptionDefProto& CaptionDefProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } CaptionDefProto* CaptionDefProto::default_instance_ = NULL; @@ -1806,7 +1909,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_color; break; } - + // required uint32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1822,7 +1925,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_stroke_color; break; } - + // optional uint32 stroke_color = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1838,7 +1941,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectTag(32)) goto parse_offset_x; break; } - + // optional int32 offset_x = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1854,7 +1957,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectTag(40)) goto parse_offset_y; break; } - + // optional int32 offset_y = 5; case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1870,7 +1973,7 @@ bool CaptionDefProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -1892,32 +1995,32 @@ void CaptionDefProto::SerializeWithCachedSizes( if (has_height()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output); } - + // required uint32 color = 2; if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); } - + // optional uint32 stroke_color = 3; if (has_stroke_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output); } - + // optional int32 offset_x = 4; if (has_offset_x()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->offset_x(), output); } - + // optional int32 offset_y = 5; if (has_offset_y()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->offset_y(), output); } - + } int CaptionDefProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required int32 height = 1; if (has_height()) { @@ -1925,35 +2028,35 @@ int CaptionDefProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::Int32Size( this->height()); } - + // required uint32 color = 2; if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional uint32 stroke_color = 3; if (has_stroke_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->stroke_color()); } - + // optional int32 offset_x = 4; if (has_offset_x()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->offset_x()); } - + // optional int32 offset_y = 5; if (has_offset_y()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->offset_y()); } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -1995,7 +2098,7 @@ void CaptionDefProto::CopyFrom(const CaptionDefProto& from) { bool CaptionDefProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - + return true; } @@ -2030,8 +2133,18 @@ CaptionRuleProto::CaptionRuleProto() } void CaptionRuleProto::InitAsDefaultInstance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + primary_ = const_cast< ::CaptionDefProto*>( + ::CaptionDefProto::internal_default_instance()); +#else primary_ = const_cast< ::CaptionDefProto*>(&::CaptionDefProto::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + secondary_ = const_cast< ::CaptionDefProto*>( + ::CaptionDefProto::internal_default_instance()); +#else secondary_ = const_cast< ::CaptionDefProto*>(&::CaptionDefProto::default_instance()); +#endif } CaptionRuleProto::CaptionRuleProto(const CaptionRuleProto& from) @@ -2053,7 +2166,11 @@ CaptionRuleProto::~CaptionRuleProto() { } void CaptionRuleProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif delete primary_; delete secondary_; } @@ -2065,7 +2182,12 @@ void CaptionRuleProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const CaptionRuleProto& CaptionRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } CaptionRuleProto* CaptionRuleProto::default_instance_ = NULL; @@ -2105,7 +2227,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_secondary; break; } - + // optional .CaptionDefProto secondary = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2119,7 +2241,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_priority; break; } - + // required int32 priority = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2135,7 +2257,7 @@ bool CaptionRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2158,23 +2280,23 @@ void CaptionRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteMessage( 1, this->primary(), output); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 2, this->secondary(), output); } - + // required int32 priority = 3; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); } - + } int CaptionRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required .CaptionDefProto primary = 1; if (has_primary()) { @@ -2182,21 +2304,21 @@ int CaptionRuleProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->primary()); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->secondary()); } - + // required int32 priority = 3; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -2232,7 +2354,7 @@ void CaptionRuleProto::CopyFrom(const CaptionRuleProto& from) { bool CaptionRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false; - + if (has_primary()) { if (!this->primary().IsInitialized()) return false; } @@ -2272,7 +2394,12 @@ CircleRuleProto::CircleRuleProto() } void CircleRuleProto::InitAsDefaultInstance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + border_ = const_cast< ::LineDefProto*>( + ::LineDefProto::internal_default_instance()); +#else border_ = const_cast< ::LineDefProto*>(&::LineDefProto::default_instance()); +#endif } CircleRuleProto::CircleRuleProto(const CircleRuleProto& from) @@ -2295,7 +2422,11 @@ CircleRuleProto::~CircleRuleProto() { } void CircleRuleProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif delete border_; } } @@ -2306,7 +2437,12 @@ void CircleRuleProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const CircleRuleProto& CircleRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } CircleRuleProto* CircleRuleProto::default_instance_ = NULL; @@ -2347,7 +2483,7 @@ bool CircleRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(16)) goto parse_color; break; } - + // required uint32 color = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2363,7 +2499,7 @@ bool CircleRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(26)) goto parse_border; break; } - + // optional .LineDefProto border = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2377,7 +2513,7 @@ bool CircleRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(32)) goto parse_priority; break; } - + // required int32 priority = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2393,7 +2529,7 @@ bool CircleRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2415,55 +2551,55 @@ void CircleRuleProto::SerializeWithCachedSizes( if (has_radius()) { ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->radius(), output); } - + // required uint32 color = 2; if (has_color()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); } - + // optional .LineDefProto border = 3; if (has_border()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 3, this->border(), output); } - + // required int32 priority = 4; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); } - + } int CircleRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required double radius = 1; if (has_radius()) { total_size += 1 + 8; } - + // required uint32 color = 2; if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->color()); } - + // optional .LineDefProto border = 3; if (has_border()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->border()); } - + // required int32 priority = 4; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -2502,7 +2638,7 @@ void CircleRuleProto::CopyFrom(const CircleRuleProto& from) { bool CircleRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false; - + if (has_border()) { if (!this->border().IsInitialized()) return false; } @@ -2539,8 +2675,18 @@ PathTextRuleProto::PathTextRuleProto() } void PathTextRuleProto::InitAsDefaultInstance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + primary_ = const_cast< ::CaptionDefProto*>( + ::CaptionDefProto::internal_default_instance()); +#else primary_ = const_cast< ::CaptionDefProto*>(&::CaptionDefProto::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + secondary_ = const_cast< ::CaptionDefProto*>( + ::CaptionDefProto::internal_default_instance()); +#else secondary_ = const_cast< ::CaptionDefProto*>(&::CaptionDefProto::default_instance()); +#endif } PathTextRuleProto::PathTextRuleProto(const PathTextRuleProto& from) @@ -2562,7 +2708,11 @@ PathTextRuleProto::~PathTextRuleProto() { } void PathTextRuleProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif delete primary_; delete secondary_; } @@ -2574,7 +2724,12 @@ void PathTextRuleProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const PathTextRuleProto& PathTextRuleProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } PathTextRuleProto* PathTextRuleProto::default_instance_ = NULL; @@ -2614,7 +2769,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_secondary; break; } - + // optional .CaptionDefProto secondary = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2628,7 +2783,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream( if (input->ExpectTag(24)) goto parse_priority; break; } - + // required int32 priority = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2644,7 +2799,7 @@ bool PathTextRuleProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2667,23 +2822,23 @@ void PathTextRuleProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteMessage( 1, this->primary(), output); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 2, this->secondary(), output); } - + // required int32 priority = 3; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output); } - + } int PathTextRuleProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required .CaptionDefProto primary = 1; if (has_primary()) { @@ -2691,21 +2846,21 @@ int PathTextRuleProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->primary()); } - + // optional .CaptionDefProto secondary = 2; if (has_secondary()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->secondary()); } - + // required int32 priority = 3; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( this->priority()); } - + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -2741,7 +2896,7 @@ void PathTextRuleProto::CopyFrom(const PathTextRuleProto& from) { bool PathTextRuleProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false; - + if (has_primary()) { if (!this->primary().IsInitialized()) return false; } @@ -2784,11 +2939,36 @@ DrawElementProto::DrawElementProto() } void DrawElementProto::InitAsDefaultInstance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + area_ = const_cast< ::AreaRuleProto*>( + ::AreaRuleProto::internal_default_instance()); +#else area_ = const_cast< ::AreaRuleProto*>(&::AreaRuleProto::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + symbol_ = const_cast< ::SymbolRuleProto*>( + ::SymbolRuleProto::internal_default_instance()); +#else symbol_ = const_cast< ::SymbolRuleProto*>(&::SymbolRuleProto::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + caption_ = const_cast< ::CaptionRuleProto*>( + ::CaptionRuleProto::internal_default_instance()); +#else caption_ = const_cast< ::CaptionRuleProto*>(&::CaptionRuleProto::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + circle_ = const_cast< ::CircleRuleProto*>( + ::CircleRuleProto::internal_default_instance()); +#else circle_ = const_cast< ::CircleRuleProto*>(&::CircleRuleProto::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + path_text_ = const_cast< ::PathTextRuleProto*>( + ::PathTextRuleProto::internal_default_instance()); +#else path_text_ = const_cast< ::PathTextRuleProto*>(&::PathTextRuleProto::default_instance()); +#endif } DrawElementProto::DrawElementProto(const DrawElementProto& from) @@ -2813,7 +2993,11 @@ DrawElementProto::~DrawElementProto() { } void DrawElementProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif delete area_; delete symbol_; delete caption_; @@ -2828,7 +3012,12 @@ void DrawElementProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const DrawElementProto& DrawElementProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } DrawElementProto* DrawElementProto::default_instance_ = NULL; @@ -2880,7 +3069,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_lines; break; } - + // repeated .LineRuleProto lines = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2895,7 +3084,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(26)) goto parse_area; break; } - + // optional .AreaRuleProto area = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2909,7 +3098,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(34)) goto parse_symbol; break; } - + // optional .SymbolRuleProto symbol = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2923,7 +3112,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(42)) goto parse_caption; break; } - + // optional .CaptionRuleProto caption = 5; case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2937,7 +3126,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(50)) goto parse_circle; break; } - + // optional .CircleRuleProto circle = 6; case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2951,7 +3140,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectTag(58)) goto parse_path_text; break; } - + // optional .PathTextRuleProto path_text = 7; case 7: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2965,7 +3154,7 @@ bool DrawElementProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -2987,48 +3176,48 @@ void DrawElementProto::SerializeWithCachedSizes( if (has_scale()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->scale(), output); } - + // repeated .LineRuleProto lines = 2; for (int i = 0; i < this->lines_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 2, this->lines(i), output); } - + // optional .AreaRuleProto area = 3; if (has_area()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 3, this->area(), output); } - + // optional .SymbolRuleProto symbol = 4; if (has_symbol()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 4, this->symbol(), output); } - + // optional .CaptionRuleProto caption = 5; if (has_caption()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 5, this->caption(), output); } - + // optional .CircleRuleProto circle = 6; if (has_circle()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 6, this->circle(), output); } - + // optional .PathTextRuleProto path_text = 7; if (has_path_text()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 7, this->path_text(), output); } - + } int DrawElementProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required int32 scale = 1; if (has_scale()) { @@ -3036,42 +3225,42 @@ int DrawElementProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::Int32Size( this->scale()); } - + // optional .AreaRuleProto area = 3; if (has_area()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->area()); } - + // optional .SymbolRuleProto symbol = 4; if (has_symbol()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->symbol()); } - + // optional .CaptionRuleProto caption = 5; if (has_caption()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->caption()); } - + // optional .CircleRuleProto circle = 6; if (has_circle()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->circle()); } - + // optional .PathTextRuleProto path_text = 7; if (has_path_text()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->path_text()); } - + } // repeated .LineRuleProto lines = 2; total_size += 1 * this->lines_size(); @@ -3080,7 +3269,7 @@ int DrawElementProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->lines(i)); } - + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); @@ -3125,7 +3314,7 @@ void DrawElementProto::CopyFrom(const DrawElementProto& from) { bool DrawElementProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - + for (int i = 0; i < lines_size(); i++) { if (!this->lines(i).IsInitialized()) return false; } @@ -3201,7 +3390,11 @@ void ClassifElementProto::SharedDtor() { if (name_ != &::google::protobuf::internal::kEmptyString) { delete name_; } + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif } } @@ -3211,7 +3404,12 @@ void ClassifElementProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const ClassifElementProto& ClassifElementProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } ClassifElementProto* ClassifElementProto::default_instance_ = NULL; @@ -3250,7 +3448,7 @@ bool ClassifElementProto::MergePartialFromCodedStream( if (input->ExpectTag(18)) goto parse_element; break; } - + // repeated .DrawElementProto element = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3265,7 +3463,7 @@ bool ClassifElementProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3288,18 +3486,18 @@ void ClassifElementProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->name(), output); } - + // repeated .DrawElementProto element = 2; for (int i = 0; i < this->element_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessage( 2, this->element(i), output); } - + } int ClassifElementProto::ByteSize() const { int total_size = 0; - + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { // required string name = 1; if (has_name()) { @@ -3307,7 +3505,7 @@ int ClassifElementProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::StringSize( this->name()); } - + } // repeated .DrawElementProto element = 2; total_size += 1 * this->element_size(); @@ -3316,7 +3514,7 @@ int ClassifElementProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->element(i)); } - + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); @@ -3346,7 +3544,7 @@ void ClassifElementProto::CopyFrom(const ClassifElementProto& from) { bool ClassifElementProto::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - + for (int i = 0; i < element_size(); i++) { if (!this->element(i).IsInitialized()) return false; } @@ -3397,7 +3595,11 @@ ContainerProto::~ContainerProto() { } void ContainerProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else if (this != default_instance_) { + #endif } } @@ -3407,7 +3609,12 @@ void ContainerProto::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_END(); } const ContainerProto& ContainerProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); return *default_instance_; +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; } ContainerProto* ContainerProto::default_instance_ = NULL; @@ -3441,7 +3648,7 @@ bool ContainerProto::MergePartialFromCodedStream( if (input->ExpectAtEnd()) return true; break; } - + default: { handle_uninterpreted: if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == @@ -3464,12 +3671,12 @@ void ContainerProto::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteMessage( 1, this->cont(i), output); } - + } int ContainerProto::ByteSize() const { int total_size = 0; - + // repeated .ClassifElementProto cont = 1; total_size += 1 * this->cont_size(); for (int i = 0; i < this->cont_size(); i++) { @@ -3477,7 +3684,7 @@ int ContainerProto::ByteSize() const { ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->cont(i)); } - + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); @@ -3501,7 +3708,7 @@ void ContainerProto::CopyFrom(const ContainerProto& from) { } bool ContainerProto::IsInitialized() const { - + for (int i = 0; i < cont_size(); i++) { if (!this->cont(i).IsInitialized()) return false; } diff --git a/indexer/drules_struct_lite.pb.h b/indexer/drules_struct_lite.pb.h index 7e83cd45f1..d52b39fb68 100644 --- a/indexer/drules_struct_lite.pb.h +++ b/indexer/drules_struct_lite.pb.h @@ -8,18 +8,19 @@ #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_lite.h> #include <google/protobuf/repeated_field.h> #include <google/protobuf/extension_set.h> // @@protoc_insertion_point(includes) @@ -69,27 +70,37 @@ class DashDotProto : public ::google::protobuf::MessageLite { public: DashDotProto(); virtual ~DashDotProto(); - + DashDotProto(const DashDotProto& from); - + inline DashDotProto& operator=(const DashDotProto& from) { CopyFrom(from); return *this; } - + static const DashDotProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const DashDotProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(DashDotProto* other); - + // implements Message ---------------------------------------------- - + DashDotProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const DashDotProto& from); void MergeFrom(const DashDotProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -101,13 +112,13 @@ class DashDotProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() const; - + // nested types ---------------------------------------------------- - + // accessors ------------------------------------------------------- - + // repeated double dd = 1; inline int dd_size() const; inline void clear_dd(); @@ -119,29 +130,33 @@ class DashDotProto : public ::google::protobuf::MessageLite { 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::RepeatedField< double > dd_; double offset_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static DashDotProto* default_instance_; }; @@ -151,27 +166,37 @@ class PathSymProto : public ::google::protobuf::MessageLite { public: PathSymProto(); virtual ~PathSymProto(); - + PathSymProto(const PathSymProto& from); - + inline PathSymProto& operator=(const PathSymProto& from) { CopyFrom(from); return *this; } - + static const PathSymProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const PathSymProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(PathSymProto* other); - + // implements Message ---------------------------------------------- - + PathSymProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const PathSymProto& from); void MergeFrom(const PathSymProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -183,13 +208,13 @@ class PathSymProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() const; - + // nested types ---------------------------------------------------- - + // accessors ------------------------------------------------------- - + // required string name = 1; inline bool has_name() const; inline void clear_name(); @@ -200,21 +225,22 @@ class PathSymProto : public ::google::protobuf::MessageLite { 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(); @@ -223,18 +249,22 @@ class PathSymProto : public ::google::protobuf::MessageLite { inline void clear_has_step(); inline void set_has_offset(); inline void clear_has_offset(); - + ::std::string* name_; double step_; double offset_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static PathSymProto* default_instance_; }; @@ -244,27 +274,37 @@ class LineRuleProto : public ::google::protobuf::MessageLite { public: LineRuleProto(); virtual ~LineRuleProto(); - + LineRuleProto(const LineRuleProto& from); - + inline LineRuleProto& operator=(const LineRuleProto& from) { CopyFrom(from); return *this; } - + static const LineRuleProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const LineRuleProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(LineRuleProto* other); - + // implements Message ---------------------------------------------- - + LineRuleProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const LineRuleProto& from); void MergeFrom(const LineRuleProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -276,27 +316,27 @@ class LineRuleProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() 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(); @@ -304,14 +344,15 @@ class LineRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -319,21 +360,22 @@ class LineRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -350,7 +392,7 @@ class LineRuleProto : public ::google::protobuf::MessageLite { inline void clear_has_join(); inline void set_has_cap(); inline void clear_has_cap(); - + double width_; ::DashDotProto* dashdot_; ::google::protobuf::uint32 color_; @@ -358,14 +400,18 @@ class LineRuleProto : public ::google::protobuf::MessageLite { ::PathSymProto* pathsym_; int join_; int cap_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static LineRuleProto* default_instance_; }; @@ -375,27 +421,37 @@ class LineDefProto : public ::google::protobuf::MessageLite { public: LineDefProto(); virtual ~LineDefProto(); - + LineDefProto(const LineDefProto& from); - + inline LineDefProto& operator=(const LineDefProto& from) { CopyFrom(from); return *this; } - + static const LineDefProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const LineDefProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(LineDefProto* other); - + // implements Message ---------------------------------------------- - + LineDefProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const LineDefProto& from); void MergeFrom(const LineDefProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -407,27 +463,27 @@ class LineDefProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() 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(); @@ -435,7 +491,8 @@ class LineDefProto : public ::google::protobuf::MessageLite { 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(); @@ -443,21 +500,22 @@ class LineDefProto : public ::google::protobuf::MessageLite { 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(); @@ -472,21 +530,25 @@ class LineDefProto : public ::google::protobuf::MessageLite { inline void clear_has_join(); inline void set_has_cap(); inline void clear_has_cap(); - + 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]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static LineDefProto* default_instance_; }; @@ -496,27 +558,37 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { public: AreaRuleProto(); virtual ~AreaRuleProto(); - + AreaRuleProto(const AreaRuleProto& from); - + inline AreaRuleProto& operator=(const AreaRuleProto& from) { CopyFrom(from); return *this; } - + static const AreaRuleProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const AreaRuleProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(AreaRuleProto* other); - + // implements Message ---------------------------------------------- - + AreaRuleProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const AreaRuleProto& from); void MergeFrom(const AreaRuleProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -528,20 +600,20 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() 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(); @@ -549,14 +621,15 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -565,18 +638,22 @@ class AreaRuleProto : public ::google::protobuf::MessageLite { inline void clear_has_border(); inline void set_has_priority(); inline void clear_has_priority(); - + ::LineDefProto* border_; ::google::protobuf::uint32 color_; ::google::protobuf::int32 priority_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static AreaRuleProto* default_instance_; }; @@ -586,27 +663,37 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { public: SymbolRuleProto(); virtual ~SymbolRuleProto(); - + SymbolRuleProto(const SymbolRuleProto& from); - + inline SymbolRuleProto& operator=(const SymbolRuleProto& from) { CopyFrom(from); return *this; } - + static const SymbolRuleProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const SymbolRuleProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(SymbolRuleProto* other); - + // implements Message ---------------------------------------------- - + SymbolRuleProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const SymbolRuleProto& from); void MergeFrom(const SymbolRuleProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -618,13 +705,13 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() const; - + // nested types ---------------------------------------------------- - + // accessors ------------------------------------------------------- - + // required string name = 1; inline bool has_name() const; inline void clear_name(); @@ -635,21 +722,22 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -658,18 +746,22 @@ class SymbolRuleProto : public ::google::protobuf::MessageLite { inline void clear_has_apply_for_type(); inline void set_has_priority(); inline void clear_has_priority(); - + ::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]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static SymbolRuleProto* default_instance_; }; @@ -679,27 +771,37 @@ class CaptionDefProto : public ::google::protobuf::MessageLite { public: CaptionDefProto(); virtual ~CaptionDefProto(); - + CaptionDefProto(const CaptionDefProto& from); - + inline CaptionDefProto& operator=(const CaptionDefProto& from) { CopyFrom(from); return *this; } - + static const CaptionDefProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const CaptionDefProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(CaptionDefProto* other); - + // implements Message ---------------------------------------------- - + CaptionDefProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const CaptionDefProto& from); void MergeFrom(const CaptionDefProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -711,48 +813,48 @@ class CaptionDefProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() 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(); @@ -765,20 +867,24 @@ class CaptionDefProto : public ::google::protobuf::MessageLite { inline void clear_has_offset_x(); inline void set_has_offset_y(); inline void clear_has_offset_y(); - + ::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]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static CaptionDefProto* default_instance_; }; @@ -788,27 +894,37 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { public: CaptionRuleProto(); virtual ~CaptionRuleProto(); - + CaptionRuleProto(const CaptionRuleProto& from); - + inline CaptionRuleProto& operator=(const CaptionRuleProto& from) { CopyFrom(from); return *this; } - + static const CaptionRuleProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const CaptionRuleProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(CaptionRuleProto* other); - + // implements Message ---------------------------------------------- - + CaptionRuleProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const CaptionRuleProto& from); void MergeFrom(const CaptionRuleProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -820,13 +936,13 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() const; - + // nested types ---------------------------------------------------- - + // accessors ------------------------------------------------------- - + // required .CaptionDefProto primary = 1; inline bool has_primary() const; inline void clear_primary(); @@ -834,7 +950,8 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -842,14 +959,15 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -858,18 +976,22 @@ class CaptionRuleProto : public ::google::protobuf::MessageLite { inline void clear_has_secondary(); inline void set_has_priority(); inline void clear_has_priority(); - + ::CaptionDefProto* primary_; ::CaptionDefProto* secondary_; ::google::protobuf::int32 priority_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static CaptionRuleProto* default_instance_; }; @@ -879,27 +1001,37 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { public: CircleRuleProto(); virtual ~CircleRuleProto(); - + CircleRuleProto(const CircleRuleProto& from); - + inline CircleRuleProto& operator=(const CircleRuleProto& from) { CopyFrom(from); return *this; } - + static const CircleRuleProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const CircleRuleProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(CircleRuleProto* other); - + // implements Message ---------------------------------------------- - + CircleRuleProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const CircleRuleProto& from); void MergeFrom(const CircleRuleProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -911,27 +1043,27 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() 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(); @@ -939,14 +1071,15 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -957,19 +1090,23 @@ class CircleRuleProto : public ::google::protobuf::MessageLite { inline void clear_has_border(); inline void set_has_priority(); inline void clear_has_priority(); - + double radius_; ::LineDefProto* border_; ::google::protobuf::uint32 color_; ::google::protobuf::int32 priority_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static CircleRuleProto* default_instance_; }; @@ -979,27 +1116,37 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite { public: PathTextRuleProto(); virtual ~PathTextRuleProto(); - + PathTextRuleProto(const PathTextRuleProto& from); - + inline PathTextRuleProto& operator=(const PathTextRuleProto& from) { CopyFrom(from); return *this; } - + static const PathTextRuleProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const PathTextRuleProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(PathTextRuleProto* other); - + // implements Message ---------------------------------------------- - + PathTextRuleProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const PathTextRuleProto& from); void MergeFrom(const PathTextRuleProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -1011,13 +1158,13 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() const; - + // nested types ---------------------------------------------------- - + // accessors ------------------------------------------------------- - + // required .CaptionDefProto primary = 1; inline bool has_primary() const; inline void clear_primary(); @@ -1025,7 +1172,8 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -1033,14 +1181,15 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite { 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(); @@ -1049,18 +1198,22 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite { inline void clear_has_secondary(); inline void set_has_priority(); inline void clear_has_priority(); - + ::CaptionDefProto* primary_; ::CaptionDefProto* secondary_; ::google::protobuf::int32 priority_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static PathTextRuleProto* default_instance_; }; @@ -1070,27 +1223,37 @@ class DrawElementProto : public ::google::protobuf::MessageLite { public: DrawElementProto(); virtual ~DrawElementProto(); - + DrawElementProto(const DrawElementProto& from); - + inline DrawElementProto& operator=(const DrawElementProto& from) { CopyFrom(from); return *this; } - + static const DrawElementProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const DrawElementProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(DrawElementProto* other); - + // implements Message ---------------------------------------------- - + DrawElementProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const DrawElementProto& from); void MergeFrom(const DrawElementProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -1102,20 +1265,20 @@ class DrawElementProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() 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(); @@ -1127,7 +1290,7 @@ class DrawElementProto : public ::google::protobuf::MessageLite { lines() const; inline ::google::protobuf::RepeatedPtrField< ::LineRuleProto >* mutable_lines(); - + // optional .AreaRuleProto area = 3; inline bool has_area() const; inline void clear_area(); @@ -1135,7 +1298,8 @@ class DrawElementProto : public ::google::protobuf::MessageLite { 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(); @@ -1143,7 +1307,8 @@ class DrawElementProto : public ::google::protobuf::MessageLite { 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(); @@ -1151,7 +1316,8 @@ class DrawElementProto : public ::google::protobuf::MessageLite { 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(); @@ -1159,7 +1325,8 @@ class DrawElementProto : public ::google::protobuf::MessageLite { 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(); @@ -1167,7 +1334,8 @@ class DrawElementProto : public ::google::protobuf::MessageLite { 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(); @@ -1182,7 +1350,7 @@ class DrawElementProto : public ::google::protobuf::MessageLite { inline void clear_has_circle(); inline void set_has_path_text(); inline void clear_has_path_text(); - + ::google::protobuf::RepeatedPtrField< ::LineRuleProto > lines_; ::AreaRuleProto* area_; ::SymbolRuleProto* symbol_; @@ -1190,14 +1358,18 @@ class DrawElementProto : public ::google::protobuf::MessageLite { ::CircleRuleProto* circle_; ::PathTextRuleProto* path_text_; ::google::protobuf::int32 scale_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static DrawElementProto* default_instance_; }; @@ -1207,27 +1379,37 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { public: ClassifElementProto(); virtual ~ClassifElementProto(); - + ClassifElementProto(const ClassifElementProto& from); - + inline ClassifElementProto& operator=(const ClassifElementProto& from) { CopyFrom(from); return *this; } - + static const ClassifElementProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const ClassifElementProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(ClassifElementProto* other); - + // implements Message ---------------------------------------------- - + ClassifElementProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const ClassifElementProto& from); void MergeFrom(const ClassifElementProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -1239,13 +1421,13 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() const; - + // nested types ---------------------------------------------------- - + // accessors ------------------------------------------------------- - + // required string name = 1; inline bool has_name() const; inline void clear_name(); @@ -1256,7 +1438,8 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { 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(); @@ -1268,22 +1451,26 @@ class ClassifElementProto : public ::google::protobuf::MessageLite { 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(); - + ::std::string* name_; ::google::protobuf::RepeatedPtrField< ::DrawElementProto > element_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static ClassifElementProto* default_instance_; }; @@ -1293,27 +1480,37 @@ class ContainerProto : public ::google::protobuf::MessageLite { public: ContainerProto(); virtual ~ContainerProto(); - + ContainerProto(const ContainerProto& from); - + inline ContainerProto& operator=(const ContainerProto& from) { CopyFrom(from); return *this; } - + static const ContainerProto& default_instance(); - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const ContainerProto* internal_default_instance() { + return default_instance_; + } + #endif + void Swap(ContainerProto* other); - + // implements Message ---------------------------------------------- - + ContainerProto* New() const; void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); void CopyFrom(const ContainerProto& from); void MergeFrom(const ContainerProto& from); void Clear(); bool IsInitialized() const; - + int ByteSize() const; bool MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input); @@ -1325,13 +1522,13 @@ class ContainerProto : public ::google::protobuf::MessageLite { void SharedDtor(); void SetCachedSize(int size) const; public: - + ::std::string GetTypeName() const; - + // nested types ---------------------------------------------------- - + // accessors ------------------------------------------------------- - + // repeated .ClassifElementProto cont = 1; inline int cont_size() const; inline void clear_cont(); @@ -1343,19 +1540,23 @@ class ContainerProto : public ::google::protobuf::MessageLite { cont() const; inline ::google::protobuf::RepeatedPtrField< ::ClassifElementProto >* mutable_cont(); - + // @@protoc_insertion_point(class_scope:ContainerProto) private: - + ::google::protobuf::RepeatedPtrField< ::ClassifElementProto > cont_; - + mutable int _cached_size_; ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32]; - + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); - + void InitAsDefaultInstance(); static ContainerProto* default_instance_; }; @@ -1474,6 +1675,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 { @@ -1582,7 +1795,11 @@ inline void LineRuleProto::clear_dashdot() { clear_has_dashdot(); } inline const ::DashDotProto& LineRuleProto::dashdot() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return dashdot_ != NULL ? *dashdot_ : *default_instance().dashdot_; +#else return dashdot_ != NULL ? *dashdot_ : *default_instance_->dashdot_; +#endif } inline ::DashDotProto* LineRuleProto::mutable_dashdot() { set_has_dashdot(); @@ -1595,6 +1812,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 { @@ -1633,7 +1859,11 @@ inline void LineRuleProto::clear_pathsym() { clear_has_pathsym(); } inline const ::PathSymProto& LineRuleProto::pathsym() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return pathsym_ != NULL ? *pathsym_ : *default_instance().pathsym_; +#else return pathsym_ != NULL ? *pathsym_ : *default_instance_->pathsym_; +#endif } inline ::PathSymProto* LineRuleProto::mutable_pathsym() { set_has_pathsym(); @@ -1646,6 +1876,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 { @@ -1661,11 +1900,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; } @@ -1684,11 +1923,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; } @@ -1756,7 +1995,11 @@ inline void LineDefProto::clear_dashdot() { clear_has_dashdot(); } inline const ::DashDotProto& LineDefProto::dashdot() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return dashdot_ != NULL ? *dashdot_ : *default_instance().dashdot_; +#else return dashdot_ != NULL ? *dashdot_ : *default_instance_->dashdot_; +#endif } inline ::DashDotProto* LineDefProto::mutable_dashdot() { set_has_dashdot(); @@ -1769,6 +2012,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 { @@ -1785,7 +2037,11 @@ inline void LineDefProto::clear_pathsym() { clear_has_pathsym(); } inline const ::PathSymProto& LineDefProto::pathsym() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return pathsym_ != NULL ? *pathsym_ : *default_instance().pathsym_; +#else return pathsym_ != NULL ? *pathsym_ : *default_instance_->pathsym_; +#endif } inline ::PathSymProto* LineDefProto::mutable_pathsym() { set_has_pathsym(); @@ -1798,6 +2054,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 { @@ -1813,11 +2078,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; } @@ -1836,11 +2101,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; } @@ -1886,7 +2151,11 @@ inline void AreaRuleProto::clear_border() { clear_has_border(); } inline const ::LineDefProto& AreaRuleProto::border() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return border_ != NULL ? *border_ : *default_instance().border_; +#else return border_ != NULL ? *border_ : *default_instance_->border_; +#endif } inline ::LineDefProto* AreaRuleProto::mutable_border() { set_has_border(); @@ -1899,6 +2168,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 { @@ -1983,6 +2261,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 { @@ -2161,7 +2451,11 @@ inline void CaptionRuleProto::clear_primary() { clear_has_primary(); } inline const ::CaptionDefProto& CaptionRuleProto::primary() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return primary_ != NULL ? *primary_ : *default_instance().primary_; +#else return primary_ != NULL ? *primary_ : *default_instance_->primary_; +#endif } inline ::CaptionDefProto* CaptionRuleProto::mutable_primary() { set_has_primary(); @@ -2174,6 +2468,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 { @@ -2190,7 +2493,11 @@ inline void CaptionRuleProto::clear_secondary() { clear_has_secondary(); } inline const ::CaptionDefProto& CaptionRuleProto::secondary() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return secondary_ != NULL ? *secondary_ : *default_instance().secondary_; +#else return secondary_ != NULL ? *secondary_ : *default_instance_->secondary_; +#endif } inline ::CaptionDefProto* CaptionRuleProto::mutable_secondary() { set_has_secondary(); @@ -2203,6 +2510,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 { @@ -2289,7 +2605,11 @@ inline void CircleRuleProto::clear_border() { clear_has_border(); } inline const ::LineDefProto& CircleRuleProto::border() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return border_ != NULL ? *border_ : *default_instance().border_; +#else return border_ != NULL ? *border_ : *default_instance_->border_; +#endif } inline ::LineDefProto* CircleRuleProto::mutable_border() { set_has_border(); @@ -2302,6 +2622,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 { @@ -2344,7 +2673,11 @@ inline void PathTextRuleProto::clear_primary() { clear_has_primary(); } inline const ::CaptionDefProto& PathTextRuleProto::primary() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return primary_ != NULL ? *primary_ : *default_instance().primary_; +#else return primary_ != NULL ? *primary_ : *default_instance_->primary_; +#endif } inline ::CaptionDefProto* PathTextRuleProto::mutable_primary() { set_has_primary(); @@ -2357,6 +2690,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 { @@ -2373,7 +2715,11 @@ inline void PathTextRuleProto::clear_secondary() { clear_has_secondary(); } inline const ::CaptionDefProto& PathTextRuleProto::secondary() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return secondary_ != NULL ? *secondary_ : *default_instance().secondary_; +#else return secondary_ != NULL ? *secondary_ : *default_instance_->secondary_; +#endif } inline ::CaptionDefProto* PathTextRuleProto::mutable_secondary() { set_has_secondary(); @@ -2386,6 +2732,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 { @@ -2475,7 +2830,11 @@ inline void DrawElementProto::clear_area() { clear_has_area(); } inline const ::AreaRuleProto& DrawElementProto::area() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return area_ != NULL ? *area_ : *default_instance().area_; +#else return area_ != NULL ? *area_ : *default_instance_->area_; +#endif } inline ::AreaRuleProto* DrawElementProto::mutable_area() { set_has_area(); @@ -2488,6 +2847,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 { @@ -2504,7 +2872,11 @@ inline void DrawElementProto::clear_symbol() { clear_has_symbol(); } inline const ::SymbolRuleProto& DrawElementProto::symbol() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return symbol_ != NULL ? *symbol_ : *default_instance().symbol_; +#else return symbol_ != NULL ? *symbol_ : *default_instance_->symbol_; +#endif } inline ::SymbolRuleProto* DrawElementProto::mutable_symbol() { set_has_symbol(); @@ -2517,6 +2889,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 { @@ -2533,7 +2914,11 @@ inline void DrawElementProto::clear_caption() { clear_has_caption(); } inline const ::CaptionRuleProto& DrawElementProto::caption() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return caption_ != NULL ? *caption_ : *default_instance().caption_; +#else return caption_ != NULL ? *caption_ : *default_instance_->caption_; +#endif } inline ::CaptionRuleProto* DrawElementProto::mutable_caption() { set_has_caption(); @@ -2546,6 +2931,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 { @@ -2562,7 +2956,11 @@ inline void DrawElementProto::clear_circle() { clear_has_circle(); } inline const ::CircleRuleProto& DrawElementProto::circle() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return circle_ != NULL ? *circle_ : *default_instance().circle_; +#else return circle_ != NULL ? *circle_ : *default_instance_->circle_; +#endif } inline ::CircleRuleProto* DrawElementProto::mutable_circle() { set_has_circle(); @@ -2575,6 +2973,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 { @@ -2591,7 +2998,11 @@ inline void DrawElementProto::clear_path_text() { clear_has_path_text(); } inline const ::PathTextRuleProto& DrawElementProto::path_text() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return path_text_ != NULL ? *path_text_ : *default_instance().path_text_; +#else return path_text_ != NULL ? *path_text_ : *default_instance_->path_text_; +#endif } inline ::PathTextRuleProto* DrawElementProto::mutable_path_text() { set_has_path_text(); @@ -2604,6 +3015,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(); + } +} // ------------------------------------------------------------------- @@ -2666,6 +3086,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 { |