diff options
author | vng <viktor.govako@gmail.com> | 2011-11-16 05:38:50 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:28:07 +0300 |
commit | 201ec0a2ba5165856e3ff7eb4d70372d60fad0bd (patch) | |
tree | 02ce321572f4f8fa4d695af929ffaa1e7ab729c0 | |
parent | 0f7073f1899586561a21a512ace82a945071691b (diff) |
[Temp] Make priority optional for LineRuleProto - avoid proto warnings for border in AreaRuleProto.
-rw-r--r-- | indexer/drules_struct.pb.cc | 12 | ||||
-rw-r--r-- | indexer/drules_struct.pb.h | 4 | ||||
-rw-r--r-- | indexer/drules_struct.proto | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc index 5b2711958d..4aaf4c9cfd 100644 --- a/indexer/drules_struct.pb.cc +++ b/indexer/drules_struct.pb.cc @@ -272,7 +272,7 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() { "\n\023drules_struct.proto\"*\n\014DashDotProto\022\n\n" "\002dd\030\001 \003(\001\022\016\n\006offset\030\002 \001(\001\"_\n\rLineRulePro" "to\022\r\n\005width\030\001 \002(\001\022\r\n\005color\030\002 \002(\r\022\036\n\007dash" - "dot\030\003 \001(\0132\r.DashDotProto\022\020\n\010priority\030\004 \002" + "dot\030\003 \001(\0132\r.DashDotProto\022\020\n\010priority\030\004 \001" "(\005\"P\n\rAreaRuleProto\022\r\n\005color\030\001 \002(\r\022\036\n\006bo" "rder\030\002 \001(\0132\016.LineRuleProto\022\020\n\010priority\030\003" " \002(\005\"I\n\017SymbolRuleProto\022\014\n\004name\030\001 \002(\t\022\026\n" @@ -699,7 +699,7 @@ bool LineRuleProto::MergePartialFromCodedStream( break; } - // required int32 priority = 4; + // optional int32 priority = 4; case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { @@ -749,7 +749,7 @@ void LineRuleProto::SerializeWithCachedSizes( 3, this->dashdot(), output); } - // required int32 priority = 4; + // optional int32 priority = 4; if (has_priority()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); } @@ -779,7 +779,7 @@ void LineRuleProto::SerializeWithCachedSizes( 3, this->dashdot(), target); } - // required int32 priority = 4; + // optional int32 priority = 4; if (has_priority()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->priority(), target); } @@ -814,7 +814,7 @@ int LineRuleProto::ByteSize() const { this->dashdot()); } - // required int32 priority = 4; + // optional int32 priority = 4; if (has_priority()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::Int32Size( @@ -877,7 +877,7 @@ void LineRuleProto::CopyFrom(const LineRuleProto& from) { } bool LineRuleProto::IsInitialized() const { - if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false; + if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; return true; } diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h index acc0777da1..4a63714713 100644 --- a/indexer/drules_struct.pb.h +++ b/indexer/drules_struct.pb.h @@ -213,7 +213,7 @@ class LineRuleProto : public ::google::protobuf::Message { inline ::DashDotProto* mutable_dashdot(); inline ::DashDotProto* release_dashdot(); - // required int32 priority = 4; + // optional int32 priority = 4; inline bool has_priority() const; inline void clear_priority(); static const int kPriorityFieldNumber = 4; @@ -1136,7 +1136,7 @@ inline ::DashDotProto* LineRuleProto::release_dashdot() { return temp; } -// required int32 priority = 4; +// optional int32 priority = 4; inline bool LineRuleProto::has_priority() const { return (_has_bits_[0] & 0x00000008u) != 0; } diff --git a/indexer/drules_struct.proto b/indexer/drules_struct.proto index 0e8a057cf3..3b3670248b 100644 --- a/indexer/drules_struct.proto +++ b/indexer/drules_struct.proto @@ -11,7 +11,7 @@ message LineRuleProto required double width = 1; required uint32 color = 2; optional DashDotProto dashdot = 3; - required int32 priority = 4; + optional int32 priority = 4; // optional, because it can be used as part of AreaRule } message AreaRuleProto |