You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/03/31 20:06:27 UTC
[1/4] mesos git commit: Upgrade protobuf to 2.6.1 to support PowerPC
LE platform [stout].
Repository: mesos
Updated Branches:
refs/heads/master a931a2418 -> 66cddafce
http://git-wip-us.apache.org/repos/asf/mesos/blob/24ad4aea/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.h
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.h b/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.h
index 3d1f130..18870cd 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.h
+++ b/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.h
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
-#if GOOGLE_PROTOBUF_VERSION < 2005000
+#if GOOGLE_PROTOBUF_VERSION < 2006000
#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 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 2006001 < 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.
@@ -107,7 +107,6 @@ class Nested : public ::google::protobuf::Message {
void SharedDtor();
void SetCachedSize(int size) const;
public:
-
::google::protobuf::Metadata GetMetadata() const;
// nested types ----------------------------------------------------
@@ -163,13 +162,11 @@ class Nested : public ::google::protobuf::Message {
::google::protobuf::UnknownFieldSet _unknown_fields_;
+ ::google::protobuf::uint32 _has_bits_[1];
+ mutable int _cached_size_;
::std::string* str_;
::std::string* optional_str_;
::google::protobuf::RepeatedPtrField< ::std::string> repeated_str_;
-
- mutable int _cached_size_;
- ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-
friend void protobuf_AddDesc_protobuf_5ftests_2eproto();
friend void protobuf_AssignDesc_protobuf_5ftests_2eproto();
friend void protobuf_ShutdownFile_protobuf_5ftests_2eproto();
@@ -226,7 +223,6 @@ class SimpleMessage : public ::google::protobuf::Message {
void SharedDtor();
void SetCachedSize(int size) const;
public:
-
::google::protobuf::Metadata GetMetadata() const;
// nested types ----------------------------------------------------
@@ -264,12 +260,10 @@ class SimpleMessage : public ::google::protobuf::Message {
::google::protobuf::UnknownFieldSet _unknown_fields_;
+ ::google::protobuf::uint32 _has_bits_[1];
+ mutable int _cached_size_;
::std::string* id_;
::google::protobuf::RepeatedField< ::google::protobuf::int32 > numbers_;
-
- mutable int _cached_size_;
- ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
-
friend void protobuf_AddDesc_protobuf_5ftests_2eproto();
friend void protobuf_AssignDesc_protobuf_5ftests_2eproto();
friend void protobuf_ShutdownFile_protobuf_5ftests_2eproto();
@@ -326,7 +320,6 @@ class Message : public ::google::protobuf::Message {
void SharedDtor();
void SetCachedSize(int size) const;
public:
-
::google::protobuf::Metadata GetMetadata() const;
// nested types ----------------------------------------------------
@@ -663,6 +656,8 @@ class Message : public ::google::protobuf::Message {
::google::protobuf::UnknownFieldSet _unknown_fields_;
+ ::google::protobuf::uint32 _has_bits_[1];
+ mutable int _cached_size_;
::std::string* str_;
bool b_;
::google::protobuf::int32 int32_;
@@ -672,9 +667,9 @@ class Message : public ::google::protobuf::Message {
::google::protobuf::uint32 uint32_;
::google::protobuf::int32 sint32_;
::google::protobuf::int64 sint64_;
+ double d_;
float f_;
int e_;
- double d_;
::tests::Nested* nested_;
::google::protobuf::RepeatedField< bool > repeated_bool_;
::google::protobuf::RepeatedPtrField< ::std::string> repeated_string_;
@@ -692,10 +687,6 @@ class Message : public ::google::protobuf::Message {
::google::protobuf::RepeatedPtrField< ::std::string> empty_;
double optional_default_;
double optional_no_default_;
-
- mutable int _cached_size_;
- ::google::protobuf::uint32 _has_bits_[(29 + 31) / 32];
-
friend void protobuf_AddDesc_protobuf_5ftests_2eproto();
friend void protobuf_AssignDesc_protobuf_5ftests_2eproto();
friend void protobuf_ShutdownFile_protobuf_5ftests_2eproto();
@@ -752,7 +743,6 @@ class ArrayMessage : public ::google::protobuf::Message {
void SharedDtor();
void SetCachedSize(int size) const;
public:
-
::google::protobuf::Metadata GetMetadata() const;
// nested types ----------------------------------------------------
@@ -776,11 +766,9 @@ class ArrayMessage : public ::google::protobuf::Message {
::google::protobuf::UnknownFieldSet _unknown_fields_;
- ::google::protobuf::RepeatedPtrField< ::tests::SimpleMessage > values_;
-
+ ::google::protobuf::uint32 _has_bits_[1];
mutable int _cached_size_;
- ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-
+ ::google::protobuf::RepeatedPtrField< ::tests::SimpleMessage > values_;
friend void protobuf_AddDesc_protobuf_5ftests_2eproto();
friend void protobuf_AssignDesc_protobuf_5ftests_2eproto();
friend void protobuf_ShutdownFile_protobuf_5ftests_2eproto();
@@ -806,54 +794,59 @@ inline void Nested::clear_has_str() {
_has_bits_[0] &= ~0x00000001u;
}
inline void Nested::clear_str() {
- if (str_ != &::google::protobuf::internal::kEmptyString) {
+ if (str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_->clear();
}
clear_has_str();
}
inline const ::std::string& Nested::str() const {
+ // @@protoc_insertion_point(field_get:tests.Nested.str)
return *str_;
}
inline void Nested::set_str(const ::std::string& value) {
set_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_ = new ::std::string;
}
str_->assign(value);
+ // @@protoc_insertion_point(field_set:tests.Nested.str)
}
inline void Nested::set_str(const char* value) {
set_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_ = new ::std::string;
}
str_->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.Nested.str)
}
inline void Nested::set_str(const char* value, size_t size) {
set_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_ = new ::std::string;
}
str_->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.Nested.str)
}
inline ::std::string* Nested::mutable_str() {
set_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_ = new ::std::string;
}
+ // @@protoc_insertion_point(field_mutable:tests.Nested.str)
return str_;
}
inline ::std::string* Nested::release_str() {
clear_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
return NULL;
} else {
::std::string* temp = str_;
- str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
return temp;
}
}
inline void Nested::set_allocated_str(::std::string* str) {
- if (str_ != &::google::protobuf::internal::kEmptyString) {
+ if (str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete str_;
}
if (str) {
@@ -861,8 +854,9 @@ inline void Nested::set_allocated_str(::std::string* str) {
str_ = str;
} else {
clear_has_str();
- str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
+ // @@protoc_insertion_point(field_set_allocated:tests.Nested.str)
}
// optional string optional_str = 2;
@@ -876,54 +870,59 @@ inline void Nested::clear_has_optional_str() {
_has_bits_[0] &= ~0x00000002u;
}
inline void Nested::clear_optional_str() {
- if (optional_str_ != &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
optional_str_->clear();
}
clear_has_optional_str();
}
inline const ::std::string& Nested::optional_str() const {
+ // @@protoc_insertion_point(field_get:tests.Nested.optional_str)
return *optional_str_;
}
inline void Nested::set_optional_str(const ::std::string& value) {
set_has_optional_str();
- if (optional_str_ == &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
optional_str_ = new ::std::string;
}
optional_str_->assign(value);
+ // @@protoc_insertion_point(field_set:tests.Nested.optional_str)
}
inline void Nested::set_optional_str(const char* value) {
set_has_optional_str();
- if (optional_str_ == &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
optional_str_ = new ::std::string;
}
optional_str_->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.Nested.optional_str)
}
inline void Nested::set_optional_str(const char* value, size_t size) {
set_has_optional_str();
- if (optional_str_ == &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
optional_str_ = new ::std::string;
}
optional_str_->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.Nested.optional_str)
}
inline ::std::string* Nested::mutable_optional_str() {
set_has_optional_str();
- if (optional_str_ == &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
optional_str_ = new ::std::string;
}
+ // @@protoc_insertion_point(field_mutable:tests.Nested.optional_str)
return optional_str_;
}
inline ::std::string* Nested::release_optional_str() {
clear_has_optional_str();
- if (optional_str_ == &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
return NULL;
} else {
::std::string* temp = optional_str_;
- optional_str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ optional_str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
return temp;
}
}
inline void Nested::set_allocated_optional_str(::std::string* optional_str) {
- if (optional_str_ != &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete optional_str_;
}
if (optional_str) {
@@ -931,8 +930,9 @@ inline void Nested::set_allocated_optional_str(::std::string* optional_str) {
optional_str_ = optional_str;
} else {
clear_has_optional_str();
- optional_str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ optional_str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
+ // @@protoc_insertion_point(field_set_allocated:tests.Nested.optional_str)
}
// repeated string repeated_str = 3;
@@ -943,39 +943,49 @@ inline void Nested::clear_repeated_str() {
repeated_str_.Clear();
}
inline const ::std::string& Nested::repeated_str(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Nested.repeated_str)
return repeated_str_.Get(index);
}
inline ::std::string* Nested::mutable_repeated_str(int index) {
+ // @@protoc_insertion_point(field_mutable:tests.Nested.repeated_str)
return repeated_str_.Mutable(index);
}
inline void Nested::set_repeated_str(int index, const ::std::string& value) {
+ // @@protoc_insertion_point(field_set:tests.Nested.repeated_str)
repeated_str_.Mutable(index)->assign(value);
}
inline void Nested::set_repeated_str(int index, const char* value) {
repeated_str_.Mutable(index)->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.Nested.repeated_str)
}
inline void Nested::set_repeated_str(int index, const char* value, size_t size) {
repeated_str_.Mutable(index)->assign(
reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.Nested.repeated_str)
}
inline ::std::string* Nested::add_repeated_str() {
return repeated_str_.Add();
}
inline void Nested::add_repeated_str(const ::std::string& value) {
repeated_str_.Add()->assign(value);
+ // @@protoc_insertion_point(field_add:tests.Nested.repeated_str)
}
inline void Nested::add_repeated_str(const char* value) {
repeated_str_.Add()->assign(value);
+ // @@protoc_insertion_point(field_add_char:tests.Nested.repeated_str)
}
inline void Nested::add_repeated_str(const char* value, size_t size) {
repeated_str_.Add()->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_add_pointer:tests.Nested.repeated_str)
}
inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
Nested::repeated_str() const {
+ // @@protoc_insertion_point(field_list:tests.Nested.repeated_str)
return repeated_str_;
}
inline ::google::protobuf::RepeatedPtrField< ::std::string>*
Nested::mutable_repeated_str() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Nested.repeated_str)
return &repeated_str_;
}
@@ -994,54 +1004,59 @@ inline void SimpleMessage::clear_has_id() {
_has_bits_[0] &= ~0x00000001u;
}
inline void SimpleMessage::clear_id() {
- if (id_ != &::google::protobuf::internal::kEmptyString) {
+ if (id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
id_->clear();
}
clear_has_id();
}
inline const ::std::string& SimpleMessage::id() const {
+ // @@protoc_insertion_point(field_get:tests.SimpleMessage.id)
return *id_;
}
inline void SimpleMessage::set_id(const ::std::string& value) {
set_has_id();
- if (id_ == &::google::protobuf::internal::kEmptyString) {
+ if (id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
id_ = new ::std::string;
}
id_->assign(value);
+ // @@protoc_insertion_point(field_set:tests.SimpleMessage.id)
}
inline void SimpleMessage::set_id(const char* value) {
set_has_id();
- if (id_ == &::google::protobuf::internal::kEmptyString) {
+ if (id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
id_ = new ::std::string;
}
id_->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.SimpleMessage.id)
}
inline void SimpleMessage::set_id(const char* value, size_t size) {
set_has_id();
- if (id_ == &::google::protobuf::internal::kEmptyString) {
+ if (id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
id_ = new ::std::string;
}
id_->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.SimpleMessage.id)
}
inline ::std::string* SimpleMessage::mutable_id() {
set_has_id();
- if (id_ == &::google::protobuf::internal::kEmptyString) {
+ if (id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
id_ = new ::std::string;
}
+ // @@protoc_insertion_point(field_mutable:tests.SimpleMessage.id)
return id_;
}
inline ::std::string* SimpleMessage::release_id() {
clear_has_id();
- if (id_ == &::google::protobuf::internal::kEmptyString) {
+ if (id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
return NULL;
} else {
::std::string* temp = id_;
- id_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
return temp;
}
}
inline void SimpleMessage::set_allocated_id(::std::string* id) {
- if (id_ != &::google::protobuf::internal::kEmptyString) {
+ if (id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete id_;
}
if (id) {
@@ -1049,8 +1064,9 @@ inline void SimpleMessage::set_allocated_id(::std::string* id) {
id_ = id;
} else {
clear_has_id();
- id_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
+ // @@protoc_insertion_point(field_set_allocated:tests.SimpleMessage.id)
}
// repeated int32 numbers = 2;
@@ -1061,20 +1077,25 @@ inline void SimpleMessage::clear_numbers() {
numbers_.Clear();
}
inline ::google::protobuf::int32 SimpleMessage::numbers(int index) const {
+ // @@protoc_insertion_point(field_get:tests.SimpleMessage.numbers)
return numbers_.Get(index);
}
inline void SimpleMessage::set_numbers(int index, ::google::protobuf::int32 value) {
numbers_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.SimpleMessage.numbers)
}
inline void SimpleMessage::add_numbers(::google::protobuf::int32 value) {
numbers_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.SimpleMessage.numbers)
}
inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
SimpleMessage::numbers() const {
+ // @@protoc_insertion_point(field_list:tests.SimpleMessage.numbers)
return numbers_;
}
inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
SimpleMessage::mutable_numbers() {
+ // @@protoc_insertion_point(field_mutable_list:tests.SimpleMessage.numbers)
return &numbers_;
}
@@ -1097,11 +1118,13 @@ inline void Message::clear_b() {
clear_has_b();
}
inline bool Message::b() const {
+ // @@protoc_insertion_point(field_get:tests.Message.b)
return b_;
}
inline void Message::set_b(bool value) {
set_has_b();
b_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.b)
}
// required string str = 1;
@@ -1115,54 +1138,59 @@ inline void Message::clear_has_str() {
_has_bits_[0] &= ~0x00000002u;
}
inline void Message::clear_str() {
- if (str_ != &::google::protobuf::internal::kEmptyString) {
+ if (str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_->clear();
}
clear_has_str();
}
inline const ::std::string& Message::str() const {
+ // @@protoc_insertion_point(field_get:tests.Message.str)
return *str_;
}
inline void Message::set_str(const ::std::string& value) {
set_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_ = new ::std::string;
}
str_->assign(value);
+ // @@protoc_insertion_point(field_set:tests.Message.str)
}
inline void Message::set_str(const char* value) {
set_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_ = new ::std::string;
}
str_->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.Message.str)
}
inline void Message::set_str(const char* value, size_t size) {
set_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_ = new ::std::string;
}
str_->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.Message.str)
}
inline ::std::string* Message::mutable_str() {
set_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_ = new ::std::string;
}
+ // @@protoc_insertion_point(field_mutable:tests.Message.str)
return str_;
}
inline ::std::string* Message::release_str() {
clear_has_str();
- if (str_ == &::google::protobuf::internal::kEmptyString) {
+ if (str_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
return NULL;
} else {
::std::string* temp = str_;
- str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
return temp;
}
}
inline void Message::set_allocated_str(::std::string* str) {
- if (str_ != &::google::protobuf::internal::kEmptyString) {
+ if (str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete str_;
}
if (str) {
@@ -1170,8 +1198,9 @@ inline void Message::set_allocated_str(::std::string* str) {
str_ = str;
} else {
clear_has_str();
- str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
+ // @@protoc_insertion_point(field_set_allocated:tests.Message.str)
}
// required bytes bytes = 2;
@@ -1185,54 +1214,59 @@ inline void Message::clear_has_bytes() {
_has_bits_[0] &= ~0x00000004u;
}
inline void Message::clear_bytes() {
- if (bytes_ != &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
bytes_->clear();
}
clear_has_bytes();
}
inline const ::std::string& Message::bytes() const {
+ // @@protoc_insertion_point(field_get:tests.Message.bytes)
return *bytes_;
}
inline void Message::set_bytes(const ::std::string& value) {
set_has_bytes();
- if (bytes_ == &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
bytes_ = new ::std::string;
}
bytes_->assign(value);
+ // @@protoc_insertion_point(field_set:tests.Message.bytes)
}
inline void Message::set_bytes(const char* value) {
set_has_bytes();
- if (bytes_ == &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
bytes_ = new ::std::string;
}
bytes_->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.Message.bytes)
}
inline void Message::set_bytes(const void* value, size_t size) {
set_has_bytes();
- if (bytes_ == &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
bytes_ = new ::std::string;
}
bytes_->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.Message.bytes)
}
inline ::std::string* Message::mutable_bytes() {
set_has_bytes();
- if (bytes_ == &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
bytes_ = new ::std::string;
}
+ // @@protoc_insertion_point(field_mutable:tests.Message.bytes)
return bytes_;
}
inline ::std::string* Message::release_bytes() {
clear_has_bytes();
- if (bytes_ == &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
return NULL;
} else {
::std::string* temp = bytes_;
- bytes_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ bytes_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
return temp;
}
}
inline void Message::set_allocated_bytes(::std::string* bytes) {
- if (bytes_ != &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete bytes_;
}
if (bytes) {
@@ -1240,8 +1274,9 @@ inline void Message::set_allocated_bytes(::std::string* bytes) {
bytes_ = bytes;
} else {
clear_has_bytes();
- bytes_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ bytes_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
}
+ // @@protoc_insertion_point(field_set_allocated:tests.Message.bytes)
}
// optional int32 int32 = 3;
@@ -1259,11 +1294,13 @@ inline void Message::clear_int32() {
clear_has_int32();
}
inline ::google::protobuf::int32 Message::int32() const {
+ // @@protoc_insertion_point(field_get:tests.Message.int32)
return int32_;
}
inline void Message::set_int32(::google::protobuf::int32 value) {
set_has_int32();
int32_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.int32)
}
// optional int64 int64 = 4;
@@ -1281,11 +1318,13 @@ inline void Message::clear_int64() {
clear_has_int64();
}
inline ::google::protobuf::int64 Message::int64() const {
+ // @@protoc_insertion_point(field_get:tests.Message.int64)
return int64_;
}
inline void Message::set_int64(::google::protobuf::int64 value) {
set_has_int64();
int64_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.int64)
}
// optional uint32 uint32 = 5;
@@ -1303,11 +1342,13 @@ inline void Message::clear_uint32() {
clear_has_uint32();
}
inline ::google::protobuf::uint32 Message::uint32() const {
+ // @@protoc_insertion_point(field_get:tests.Message.uint32)
return uint32_;
}
inline void Message::set_uint32(::google::protobuf::uint32 value) {
set_has_uint32();
uint32_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.uint32)
}
// optional uint64 uint64 = 6;
@@ -1325,11 +1366,13 @@ inline void Message::clear_uint64() {
clear_has_uint64();
}
inline ::google::protobuf::uint64 Message::uint64() const {
+ // @@protoc_insertion_point(field_get:tests.Message.uint64)
return uint64_;
}
inline void Message::set_uint64(::google::protobuf::uint64 value) {
set_has_uint64();
uint64_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.uint64)
}
// optional sint32 sint32 = 7;
@@ -1347,11 +1390,13 @@ inline void Message::clear_sint32() {
clear_has_sint32();
}
inline ::google::protobuf::int32 Message::sint32() const {
+ // @@protoc_insertion_point(field_get:tests.Message.sint32)
return sint32_;
}
inline void Message::set_sint32(::google::protobuf::int32 value) {
set_has_sint32();
sint32_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.sint32)
}
// optional sint64 sint64 = 8;
@@ -1369,11 +1414,13 @@ inline void Message::clear_sint64() {
clear_has_sint64();
}
inline ::google::protobuf::int64 Message::sint64() const {
+ // @@protoc_insertion_point(field_get:tests.Message.sint64)
return sint64_;
}
inline void Message::set_sint64(::google::protobuf::int64 value) {
set_has_sint64();
sint64_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.sint64)
}
// required float f = 9;
@@ -1391,11 +1438,13 @@ inline void Message::clear_f() {
clear_has_f();
}
inline float Message::f() const {
+ // @@protoc_insertion_point(field_get:tests.Message.f)
return f_;
}
inline void Message::set_f(float value) {
set_has_f();
f_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.f)
}
// required double d = 10;
@@ -1413,11 +1462,13 @@ inline void Message::clear_d() {
clear_has_d();
}
inline double Message::d() const {
+ // @@protoc_insertion_point(field_get:tests.Message.d)
return d_;
}
inline void Message::set_d(double value) {
set_has_d();
d_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.d)
}
// required .tests.Enum e = 11;
@@ -1435,12 +1486,14 @@ inline void Message::clear_e() {
clear_has_e();
}
inline ::tests::Enum Message::e() const {
+ // @@protoc_insertion_point(field_get:tests.Message.e)
return static_cast< ::tests::Enum >(e_);
}
inline void Message::set_e(::tests::Enum value) {
assert(::tests::Enum_IsValid(value));
set_has_e();
e_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.e)
}
// required .tests.Nested nested = 12;
@@ -1458,11 +1511,13 @@ inline void Message::clear_nested() {
clear_has_nested();
}
inline const ::tests::Nested& Message::nested() const {
+ // @@protoc_insertion_point(field_get:tests.Message.nested)
return nested_ != NULL ? *nested_ : *default_instance_->nested_;
}
inline ::tests::Nested* Message::mutable_nested() {
set_has_nested();
if (nested_ == NULL) nested_ = new ::tests::Nested;
+ // @@protoc_insertion_point(field_mutable:tests.Message.nested)
return nested_;
}
inline ::tests::Nested* Message::release_nested() {
@@ -1479,6 +1534,7 @@ inline void Message::set_allocated_nested(::tests::Nested* nested) {
} else {
clear_has_nested();
}
+ // @@protoc_insertion_point(field_set_allocated:tests.Message.nested)
}
// repeated bool repeated_bool = 27;
@@ -1489,20 +1545,25 @@ inline void Message::clear_repeated_bool() {
repeated_bool_.Clear();
}
inline bool Message::repeated_bool(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_bool)
return repeated_bool_.Get(index);
}
inline void Message::set_repeated_bool(int index, bool value) {
repeated_bool_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_bool)
}
inline void Message::add_repeated_bool(bool value) {
repeated_bool_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_bool)
}
inline const ::google::protobuf::RepeatedField< bool >&
Message::repeated_bool() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_bool)
return repeated_bool_;
}
inline ::google::protobuf::RepeatedField< bool >*
Message::mutable_repeated_bool() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_bool)
return &repeated_bool_;
}
@@ -1514,39 +1575,49 @@ inline void Message::clear_repeated_string() {
repeated_string_.Clear();
}
inline const ::std::string& Message::repeated_string(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_string)
return repeated_string_.Get(index);
}
inline ::std::string* Message::mutable_repeated_string(int index) {
+ // @@protoc_insertion_point(field_mutable:tests.Message.repeated_string)
return repeated_string_.Mutable(index);
}
inline void Message::set_repeated_string(int index, const ::std::string& value) {
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_string)
repeated_string_.Mutable(index)->assign(value);
}
inline void Message::set_repeated_string(int index, const char* value) {
repeated_string_.Mutable(index)->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.Message.repeated_string)
}
inline void Message::set_repeated_string(int index, const char* value, size_t size) {
repeated_string_.Mutable(index)->assign(
reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.Message.repeated_string)
}
inline ::std::string* Message::add_repeated_string() {
return repeated_string_.Add();
}
inline void Message::add_repeated_string(const ::std::string& value) {
repeated_string_.Add()->assign(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_string)
}
inline void Message::add_repeated_string(const char* value) {
repeated_string_.Add()->assign(value);
+ // @@protoc_insertion_point(field_add_char:tests.Message.repeated_string)
}
inline void Message::add_repeated_string(const char* value, size_t size) {
repeated_string_.Add()->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_add_pointer:tests.Message.repeated_string)
}
inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
Message::repeated_string() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_string)
return repeated_string_;
}
inline ::google::protobuf::RepeatedPtrField< ::std::string>*
Message::mutable_repeated_string() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_string)
return &repeated_string_;
}
@@ -1558,39 +1629,49 @@ inline void Message::clear_repeated_bytes() {
repeated_bytes_.Clear();
}
inline const ::std::string& Message::repeated_bytes(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_bytes)
return repeated_bytes_.Get(index);
}
inline ::std::string* Message::mutable_repeated_bytes(int index) {
+ // @@protoc_insertion_point(field_mutable:tests.Message.repeated_bytes)
return repeated_bytes_.Mutable(index);
}
inline void Message::set_repeated_bytes(int index, const ::std::string& value) {
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_bytes)
repeated_bytes_.Mutable(index)->assign(value);
}
inline void Message::set_repeated_bytes(int index, const char* value) {
repeated_bytes_.Mutable(index)->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.Message.repeated_bytes)
}
inline void Message::set_repeated_bytes(int index, const void* value, size_t size) {
repeated_bytes_.Mutable(index)->assign(
reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.Message.repeated_bytes)
}
inline ::std::string* Message::add_repeated_bytes() {
return repeated_bytes_.Add();
}
inline void Message::add_repeated_bytes(const ::std::string& value) {
repeated_bytes_.Add()->assign(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_bytes)
}
inline void Message::add_repeated_bytes(const char* value) {
repeated_bytes_.Add()->assign(value);
+ // @@protoc_insertion_point(field_add_char:tests.Message.repeated_bytes)
}
inline void Message::add_repeated_bytes(const void* value, size_t size) {
repeated_bytes_.Add()->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_add_pointer:tests.Message.repeated_bytes)
}
inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
Message::repeated_bytes() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_bytes)
return repeated_bytes_;
}
inline ::google::protobuf::RepeatedPtrField< ::std::string>*
Message::mutable_repeated_bytes() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_bytes)
return &repeated_bytes_;
}
@@ -1602,20 +1683,25 @@ inline void Message::clear_repeated_int32() {
repeated_int32_.Clear();
}
inline ::google::protobuf::int32 Message::repeated_int32(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_int32)
return repeated_int32_.Get(index);
}
inline void Message::set_repeated_int32(int index, ::google::protobuf::int32 value) {
repeated_int32_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_int32)
}
inline void Message::add_repeated_int32(::google::protobuf::int32 value) {
repeated_int32_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_int32)
}
inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
Message::repeated_int32() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_int32)
return repeated_int32_;
}
inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
Message::mutable_repeated_int32() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_int32)
return &repeated_int32_;
}
@@ -1627,20 +1713,25 @@ inline void Message::clear_repeated_int64() {
repeated_int64_.Clear();
}
inline ::google::protobuf::int64 Message::repeated_int64(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_int64)
return repeated_int64_.Get(index);
}
inline void Message::set_repeated_int64(int index, ::google::protobuf::int64 value) {
repeated_int64_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_int64)
}
inline void Message::add_repeated_int64(::google::protobuf::int64 value) {
repeated_int64_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_int64)
}
inline const ::google::protobuf::RepeatedField< ::google::protobuf::int64 >&
Message::repeated_int64() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_int64)
return repeated_int64_;
}
inline ::google::protobuf::RepeatedField< ::google::protobuf::int64 >*
Message::mutable_repeated_int64() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_int64)
return &repeated_int64_;
}
@@ -1652,20 +1743,25 @@ inline void Message::clear_repeated_uint32() {
repeated_uint32_.Clear();
}
inline ::google::protobuf::uint32 Message::repeated_uint32(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_uint32)
return repeated_uint32_.Get(index);
}
inline void Message::set_repeated_uint32(int index, ::google::protobuf::uint32 value) {
repeated_uint32_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_uint32)
}
inline void Message::add_repeated_uint32(::google::protobuf::uint32 value) {
repeated_uint32_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_uint32)
}
inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
Message::repeated_uint32() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_uint32)
return repeated_uint32_;
}
inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
Message::mutable_repeated_uint32() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_uint32)
return &repeated_uint32_;
}
@@ -1677,20 +1773,25 @@ inline void Message::clear_repeated_uint64() {
repeated_uint64_.Clear();
}
inline ::google::protobuf::uint64 Message::repeated_uint64(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_uint64)
return repeated_uint64_.Get(index);
}
inline void Message::set_repeated_uint64(int index, ::google::protobuf::uint64 value) {
repeated_uint64_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_uint64)
}
inline void Message::add_repeated_uint64(::google::protobuf::uint64 value) {
repeated_uint64_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_uint64)
}
inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint64 >&
Message::repeated_uint64() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_uint64)
return repeated_uint64_;
}
inline ::google::protobuf::RepeatedField< ::google::protobuf::uint64 >*
Message::mutable_repeated_uint64() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_uint64)
return &repeated_uint64_;
}
@@ -1702,20 +1803,25 @@ inline void Message::clear_repeated_sint32() {
repeated_sint32_.Clear();
}
inline ::google::protobuf::int32 Message::repeated_sint32(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_sint32)
return repeated_sint32_.Get(index);
}
inline void Message::set_repeated_sint32(int index, ::google::protobuf::int32 value) {
repeated_sint32_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_sint32)
}
inline void Message::add_repeated_sint32(::google::protobuf::int32 value) {
repeated_sint32_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_sint32)
}
inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
Message::repeated_sint32() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_sint32)
return repeated_sint32_;
}
inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
Message::mutable_repeated_sint32() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_sint32)
return &repeated_sint32_;
}
@@ -1727,20 +1833,25 @@ inline void Message::clear_repeated_sint64() {
repeated_sint64_.Clear();
}
inline ::google::protobuf::int64 Message::repeated_sint64(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_sint64)
return repeated_sint64_.Get(index);
}
inline void Message::set_repeated_sint64(int index, ::google::protobuf::int64 value) {
repeated_sint64_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_sint64)
}
inline void Message::add_repeated_sint64(::google::protobuf::int64 value) {
repeated_sint64_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_sint64)
}
inline const ::google::protobuf::RepeatedField< ::google::protobuf::int64 >&
Message::repeated_sint64() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_sint64)
return repeated_sint64_;
}
inline ::google::protobuf::RepeatedField< ::google::protobuf::int64 >*
Message::mutable_repeated_sint64() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_sint64)
return &repeated_sint64_;
}
@@ -1752,20 +1863,25 @@ inline void Message::clear_repeated_float() {
repeated_float_.Clear();
}
inline float Message::repeated_float(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_float)
return repeated_float_.Get(index);
}
inline void Message::set_repeated_float(int index, float value) {
repeated_float_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_float)
}
inline void Message::add_repeated_float(float value) {
repeated_float_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_float)
}
inline const ::google::protobuf::RepeatedField< float >&
Message::repeated_float() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_float)
return repeated_float_;
}
inline ::google::protobuf::RepeatedField< float >*
Message::mutable_repeated_float() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_float)
return &repeated_float_;
}
@@ -1777,20 +1893,25 @@ inline void Message::clear_repeated_double() {
repeated_double_.Clear();
}
inline double Message::repeated_double(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_double)
return repeated_double_.Get(index);
}
inline void Message::set_repeated_double(int index, double value) {
repeated_double_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_double)
}
inline void Message::add_repeated_double(double value) {
repeated_double_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_double)
}
inline const ::google::protobuf::RepeatedField< double >&
Message::repeated_double() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_double)
return repeated_double_;
}
inline ::google::protobuf::RepeatedField< double >*
Message::mutable_repeated_double() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_double)
return &repeated_double_;
}
@@ -1802,22 +1923,27 @@ inline void Message::clear_repeated_enum() {
repeated_enum_.Clear();
}
inline ::tests::Enum Message::repeated_enum(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_enum)
return static_cast< ::tests::Enum >(repeated_enum_.Get(index));
}
inline void Message::set_repeated_enum(int index, ::tests::Enum value) {
assert(::tests::Enum_IsValid(value));
repeated_enum_.Set(index, value);
+ // @@protoc_insertion_point(field_set:tests.Message.repeated_enum)
}
inline void Message::add_repeated_enum(::tests::Enum value) {
assert(::tests::Enum_IsValid(value));
repeated_enum_.Add(value);
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_enum)
}
inline const ::google::protobuf::RepeatedField<int>&
Message::repeated_enum() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_enum)
return repeated_enum_;
}
inline ::google::protobuf::RepeatedField<int>*
Message::mutable_repeated_enum() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_enum)
return &repeated_enum_;
}
@@ -1829,20 +1955,25 @@ inline void Message::clear_repeated_nested() {
repeated_nested_.Clear();
}
inline const ::tests::Nested& Message::repeated_nested(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.repeated_nested)
return repeated_nested_.Get(index);
}
inline ::tests::Nested* Message::mutable_repeated_nested(int index) {
+ // @@protoc_insertion_point(field_mutable:tests.Message.repeated_nested)
return repeated_nested_.Mutable(index);
}
inline ::tests::Nested* Message::add_repeated_nested() {
+ // @@protoc_insertion_point(field_add:tests.Message.repeated_nested)
return repeated_nested_.Add();
}
inline const ::google::protobuf::RepeatedPtrField< ::tests::Nested >&
Message::repeated_nested() const {
+ // @@protoc_insertion_point(field_list:tests.Message.repeated_nested)
return repeated_nested_;
}
inline ::google::protobuf::RepeatedPtrField< ::tests::Nested >*
Message::mutable_repeated_nested() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.repeated_nested)
return &repeated_nested_;
}
@@ -1854,39 +1985,49 @@ inline void Message::clear_empty() {
empty_.Clear();
}
inline const ::std::string& Message::empty(int index) const {
+ // @@protoc_insertion_point(field_get:tests.Message.empty)
return empty_.Get(index);
}
inline ::std::string* Message::mutable_empty(int index) {
+ // @@protoc_insertion_point(field_mutable:tests.Message.empty)
return empty_.Mutable(index);
}
inline void Message::set_empty(int index, const ::std::string& value) {
+ // @@protoc_insertion_point(field_set:tests.Message.empty)
empty_.Mutable(index)->assign(value);
}
inline void Message::set_empty(int index, const char* value) {
empty_.Mutable(index)->assign(value);
+ // @@protoc_insertion_point(field_set_char:tests.Message.empty)
}
inline void Message::set_empty(int index, const char* value, size_t size) {
empty_.Mutable(index)->assign(
reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_set_pointer:tests.Message.empty)
}
inline ::std::string* Message::add_empty() {
return empty_.Add();
}
inline void Message::add_empty(const ::std::string& value) {
empty_.Add()->assign(value);
+ // @@protoc_insertion_point(field_add:tests.Message.empty)
}
inline void Message::add_empty(const char* value) {
empty_.Add()->assign(value);
+ // @@protoc_insertion_point(field_add_char:tests.Message.empty)
}
inline void Message::add_empty(const char* value, size_t size) {
empty_.Add()->assign(reinterpret_cast<const char*>(value), size);
+ // @@protoc_insertion_point(field_add_pointer:tests.Message.empty)
}
inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
Message::empty() const {
+ // @@protoc_insertion_point(field_list:tests.Message.empty)
return empty_;
}
inline ::google::protobuf::RepeatedPtrField< ::std::string>*
Message::mutable_empty() {
+ // @@protoc_insertion_point(field_mutable_list:tests.Message.empty)
return &empty_;
}
@@ -1905,11 +2046,13 @@ inline void Message::clear_optional_default() {
clear_has_optional_default();
}
inline double Message::optional_default() const {
+ // @@protoc_insertion_point(field_get:tests.Message.optional_default)
return optional_default_;
}
inline void Message::set_optional_default(double value) {
set_has_optional_default();
optional_default_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.optional_default)
}
// optional double optional_no_default = 29;
@@ -1927,11 +2070,13 @@ inline void Message::clear_optional_no_default() {
clear_has_optional_no_default();
}
inline double Message::optional_no_default() const {
+ // @@protoc_insertion_point(field_get:tests.Message.optional_no_default)
return optional_no_default_;
}
inline void Message::set_optional_no_default(double value) {
set_has_optional_no_default();
optional_no_default_ = value;
+ // @@protoc_insertion_point(field_set:tests.Message.optional_no_default)
}
// -------------------------------------------------------------------
@@ -1946,20 +2091,25 @@ inline void ArrayMessage::clear_values() {
values_.Clear();
}
inline const ::tests::SimpleMessage& ArrayMessage::values(int index) const {
+ // @@protoc_insertion_point(field_get:tests.ArrayMessage.values)
return values_.Get(index);
}
inline ::tests::SimpleMessage* ArrayMessage::mutable_values(int index) {
+ // @@protoc_insertion_point(field_mutable:tests.ArrayMessage.values)
return values_.Mutable(index);
}
inline ::tests::SimpleMessage* ArrayMessage::add_values() {
+ // @@protoc_insertion_point(field_add:tests.ArrayMessage.values)
return values_.Add();
}
inline const ::google::protobuf::RepeatedPtrField< ::tests::SimpleMessage >&
ArrayMessage::values() const {
+ // @@protoc_insertion_point(field_list:tests.ArrayMessage.values)
return values_;
}
inline ::google::protobuf::RepeatedPtrField< ::tests::SimpleMessage >*
ArrayMessage::mutable_values() {
+ // @@protoc_insertion_point(field_mutable_list:tests.ArrayMessage.values)
return &values_;
}
@@ -1972,6 +2122,7 @@ ArrayMessage::mutable_values() {
namespace google {
namespace protobuf {
+template <> struct is_proto_enum< ::tests::Enum> : ::google::protobuf::internal::true_type {};
template <>
inline const EnumDescriptor* GetEnumDescriptor< ::tests::Enum>() {
return ::tests::Enum_descriptor();
[4/4] mesos git commit: Upgrade protobuf to 2.6.1 to support PowerPC
LE platform [mesos].
Posted by vi...@apache.org.
Upgrade protobuf to 2.6.1 to support PowerPC LE platform [mesos].
Review: https://reviews.apache.org/r/45367/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/66cddafc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/66cddafc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/66cddafc
Branch: refs/heads/master
Commit: 66cddafce0f8a504e46aee4bf097a0ae468a1e1f
Parents: 51872fb
Author: Zhiwei Chen <zh...@gmail.com>
Authored: Thu Mar 31 10:08:55 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Mar 31 10:08:55 2016 -0700
----------------------------------------------------------------------
3rdparty/cmake/Versions.cmake | 2 +-
LICENSE | 4 ++--
configure.ac | 2 +-
src/java/mesos.pom.in | 2 +-
src/python/interface/setup.py.in | 2 +-
src/python/native_common/ext_modules.py.in | 2 +-
src/python/protocol/setup.py.in | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/66cddafc/3rdparty/cmake/Versions.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index 6530fcc..b89efd5 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -9,6 +9,6 @@ set(LIBEV_VERSION "4.15")
# TODO(hausdorff): (MESOS-3529) transition this back to a non-beta version.
set(LIBEVENT_VERSION "2.1.5-beta")
set(PICOJSON_VERSION "1.3.0")
-set(PROTOBUF_VERSION "2.5.0")
+set(PROTOBUF_VERSION "2.6.1")
set(ZOOKEEPER_VERSION "3.4.5")
set(ZLIB_VERSION "1.2.8")
http://git-wip-us.apache.org/repos/asf/mesos/blob/66cddafc/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4cc7f5b..bbea085 100644
--- a/LICENSE
+++ b/LICENSE
@@ -432,8 +432,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
======================================================================
-For protobuf-2.5.0
-(3rdparty/libprocess/3rdparty/protobuf-2.5.0.tar.gz):
+For protobuf-2.6.1
+(3rdparty/libprocess/3rdparty/protobuf-2.6.1.tar.gz):
======================================================================
Copyright 2008, Google Inc.
http://git-wip-us.apache.org/repos/asf/mesos/blob/66cddafc/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 812c92a..c693b82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1580,7 +1580,7 @@ correct if youre already doing this.
fi
else
with_bundled_protobuf=yes
- PROTOBUF_JAR="\${MESOS_BUILD_DIR}/src/java/target/protobuf-java-2.5.0.jar"
+ PROTOBUF_JAR="\${MESOS_BUILD_DIR}/src/java/target/protobuf-java-2.6.1.jar"
fi
http://git-wip-us.apache.org/repos/asf/mesos/blob/66cddafc/src/java/mesos.pom.in
----------------------------------------------------------------------
diff --git a/src/java/mesos.pom.in b/src/java/mesos.pom.in
index 7615d61..080767f 100644
--- a/src/java/mesos.pom.in
+++ b/src/java/mesos.pom.in
@@ -83,7 +83,7 @@
<dependency>
<artifactId>protobuf-java</artifactId>
<groupId>com.google.protobuf</groupId>
- <version>2.5.0</version>
+ <version>2.6.1</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/mesos/blob/66cddafc/src/python/interface/setup.py.in
----------------------------------------------------------------------
diff --git a/src/python/interface/setup.py.in b/src/python/interface/setup.py.in
index d739967..037c2ec 100644
--- a/src/python/interface/setup.py.in
+++ b/src/python/interface/setup.py.in
@@ -26,7 +26,7 @@ config = {
'namespace_packages': [ 'mesos' ],
'packages': [ 'mesos', 'mesos.interface' ],
'package_dir': { '': 'src' },
- 'install_requires': [ 'google-common>=0.0.1', 'protobuf>=2.5.0,<3' ],
+ 'install_requires': [ 'google-common>=0.0.1', 'protobuf>=2.6.1,<3' ],
'license': 'Apache 2.0',
'keywords': 'mesos',
'classifiers': [ ]
http://git-wip-us.apache.org/repos/asf/mesos/blob/66cddafc/src/python/native_common/ext_modules.py.in
----------------------------------------------------------------------
diff --git a/src/python/native_common/ext_modules.py.in b/src/python/native_common/ext_modules.py.in
index c335bd8..1c2fc49 100644
--- a/src/python/native_common/ext_modules.py.in
+++ b/src/python/native_common/ext_modules.py.in
@@ -43,7 +43,7 @@ def _create_module(module_name):
# libev.a and libprofiler.a).
glog = os.path.join(libprocess, '3rdparty', 'glog-0.3.3')
gperftools = os.path.join(libprocess, '3rdparty', 'gperftools-2.0')
- protobuf = os.path.join(libprocess, '3rdparty', 'protobuf-2.5.0')
+ protobuf = os.path.join(libprocess, '3rdparty', 'protobuf-2.6.1')
# Build the list of source files. Note that each source must be
# relative to our current directory (where this script lives).
http://git-wip-us.apache.org/repos/asf/mesos/blob/66cddafc/src/python/protocol/setup.py.in
----------------------------------------------------------------------
diff --git a/src/python/protocol/setup.py.in b/src/python/protocol/setup.py.in
index 4c50fbb..5dd4a0a 100644
--- a/src/python/protocol/setup.py.in
+++ b/src/python/protocol/setup.py.in
@@ -26,7 +26,7 @@ config = {
'namespace_packages': [ 'mesos' ],
'packages': [ 'mesos', 'mesos.protocol' ],
'package_dir': { '': 'src' },
- 'install_requires': [ 'protobuf>=2.5.0,<3' ],
+ 'install_requires': [ 'protobuf>=2.6.1,<3' ],
'license': 'Apache 2.0',
'keywords': 'mesos',
'classifiers': [ ]
[2/4] mesos git commit: Upgrade protobuf to 2.6.1 to support PowerPC
LE platform [stout].
Posted by vi...@apache.org.
Upgrade protobuf to 2.6.1 to support PowerPC LE platform [stout].
Review: https://reviews.apache.org/r/44257/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/24ad4aea
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/24ad4aea
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/24ad4aea
Branch: refs/heads/master
Commit: 24ad4aea36dc5c37aa0987b5557f10078bc9b852
Parents: a931a24
Author: Zhiwei Chen <zh...@gmail.com>
Authored: Thu Mar 31 10:08:40 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Mar 31 10:08:40 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/README.md | 2 +-
.../3rdparty/stout/tests/protobuf_tests.pb.cc | 531 ++++++++++---------
.../3rdparty/stout/tests/protobuf_tests.pb.h | 287 +++++++---
3 files changed, 504 insertions(+), 316 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/24ad4aea/3rdparty/libprocess/3rdparty/stout/README.md
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/README.md b/3rdparty/libprocess/3rdparty/stout/README.md
index c534835..7fd1367 100644
--- a/3rdparty/libprocess/3rdparty/stout/README.md
+++ b/3rdparty/libprocess/3rdparty/stout/README.md
@@ -6,7 +6,7 @@ Stout is a header-only C++ library. Simply add the `include` folder to your incl
>
> - Boost
> - Google's glog (this dependency will be removed in the future)
-> - Google's protobuf (version 2.5.0 is required to run tests)
+> - Google's protobuf (version 2.6.1 is required to run tests)
> - Google's gmock/gtest
There are a handful of data structures provided within the library (including some collections), as well as some namespaced and miscellaneous utilities. Also included are abstractions for [command line flags](#flags).
http://git-wip-us.apache.org/repos/asf/mesos/blob/24ad4aea/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.cc
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.cc b/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.cc
index fb11b11..b2458f0 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.cc
+++ b/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.pb.cc
@@ -244,6 +244,7 @@ const int Nested::kRepeatedStrFieldNumber;
Nested::Nested()
: ::google::protobuf::Message() {
SharedCtor();
+ // @@protoc_insertion_point(constructor:tests.Nested)
}
void Nested::InitAsDefaultInstance() {
@@ -253,24 +254,27 @@ Nested::Nested(const Nested& from)
: ::google::protobuf::Message() {
SharedCtor();
MergeFrom(from);
+ // @@protoc_insertion_point(copy_constructor:tests.Nested)
}
void Nested::SharedCtor() {
+ ::google::protobuf::internal::GetEmptyString();
_cached_size_ = 0;
- str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- optional_str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+ optional_str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
Nested::~Nested() {
+ // @@protoc_insertion_point(destructor:tests.Nested)
SharedDtor();
}
void Nested::SharedDtor() {
- if (str_ != &::google::protobuf::internal::kEmptyString) {
+ if (str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete str_;
}
- if (optional_str_ != &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete optional_str_;
}
if (this != default_instance_) {
@@ -299,14 +303,14 @@ Nested* Nested::New() const {
}
void Nested::Clear() {
- if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+ if (_has_bits_[0 / 32] & 3) {
if (has_str()) {
- if (str_ != &::google::protobuf::internal::kEmptyString) {
+ if (str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_->clear();
}
}
if (has_optional_str()) {
- if (optional_str_ != &::google::protobuf::internal::kEmptyString) {
+ if (optional_str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
optional_str_->clear();
}
}
@@ -318,21 +322,25 @@ void Nested::Clear() {
bool Nested::MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
::google::protobuf::uint32 tag;
- while ((tag = input->ReadTag()) != 0) {
+ // @@protoc_insertion_point(parse_start:tests.Nested)
+ for (;;) {
+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+ tag = p.first;
+ if (!p.second) goto handle_unusual;
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// required string str = 1;
case 1: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 10) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_str()));
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->str().data(), this->str().length(),
- ::google::protobuf::internal::WireFormat::PARSE);
+ ::google::protobuf::internal::WireFormat::PARSE,
+ "str");
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(18)) goto parse_optional_str;
break;
@@ -340,16 +348,16 @@ bool Nested::MergePartialFromCodedStream(
// optional string optional_str = 2;
case 2: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 18) {
parse_optional_str:
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_optional_str()));
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->optional_str().data(), this->optional_str().length(),
- ::google::protobuf::internal::WireFormat::PARSE);
+ ::google::protobuf::internal::WireFormat::PARSE,
+ "optional_str");
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(26)) goto parse_repeated_str;
break;
@@ -357,28 +365,29 @@ bool Nested::MergePartialFromCodedStream(
// repeated string repeated_str = 3;
case 3: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 26) {
parse_repeated_str:
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->add_repeated_str()));
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->repeated_str(this->repeated_str_size() - 1).data(),
this->repeated_str(this->repeated_str_size() - 1).length(),
- ::google::protobuf::internal::WireFormat::PARSE);
+ ::google::protobuf::internal::WireFormat::PARSE,
+ "repeated_str");
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(26)) goto parse_repeated_str;
- if (input->ExpectAtEnd()) return true;
+ if (input->ExpectAtEnd()) goto success;
break;
}
default: {
- handle_uninterpreted:
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ handle_unusual:
+ if (tag == 0 ||
+ ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
- return true;
+ goto success;
}
DO_(::google::protobuf::internal::WireFormat::SkipField(
input, tag, mutable_unknown_fields()));
@@ -386,35 +395,44 @@ bool Nested::MergePartialFromCodedStream(
}
}
}
+success:
+ // @@protoc_insertion_point(parse_success:tests.Nested)
return true;
+failure:
+ // @@protoc_insertion_point(parse_failure:tests.Nested)
+ return false;
#undef DO_
}
void Nested::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
+ // @@protoc_insertion_point(serialize_start:tests.Nested)
// required string str = 1;
if (has_str()) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->str().data(), this->str().length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
- ::google::protobuf::internal::WireFormatLite::WriteString(
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "str");
+ ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
1, this->str(), output);
}
// optional string optional_str = 2;
if (has_optional_str()) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->optional_str().data(), this->optional_str().length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
- ::google::protobuf::internal::WireFormatLite::WriteString(
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "optional_str");
+ ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
2, this->optional_str(), output);
}
// repeated string repeated_str = 3;
for (int i = 0; i < this->repeated_str_size(); i++) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->repeated_str(i).data(), this->repeated_str(i).length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "repeated_str");
::google::protobuf::internal::WireFormatLite::WriteString(
3, this->repeated_str(i), output);
}
@@ -423,15 +441,18 @@ void Nested::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormat::SerializeUnknownFields(
unknown_fields(), output);
}
+ // @@protoc_insertion_point(serialize_end:tests.Nested)
}
::google::protobuf::uint8* Nested::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
+ // @@protoc_insertion_point(serialize_to_array_start:tests.Nested)
// required string str = 1;
if (has_str()) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->str().data(), this->str().length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "str");
target =
::google::protobuf::internal::WireFormatLite::WriteStringToArray(
1, this->str(), target);
@@ -439,9 +460,10 @@ void Nested::SerializeWithCachedSizes(
// optional string optional_str = 2;
if (has_optional_str()) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->optional_str().data(), this->optional_str().length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "optional_str");
target =
::google::protobuf::internal::WireFormatLite::WriteStringToArray(
2, this->optional_str(), target);
@@ -449,9 +471,10 @@ void Nested::SerializeWithCachedSizes(
// repeated string repeated_str = 3;
for (int i = 0; i < this->repeated_str_size(); i++) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->repeated_str(i).data(), this->repeated_str(i).length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "repeated_str");
target = ::google::protobuf::internal::WireFormatLite::
WriteStringToArray(3, this->repeated_str(i), target);
}
@@ -460,6 +483,7 @@ void Nested::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
unknown_fields(), target);
}
+ // @@protoc_insertion_point(serialize_to_array_end:tests.Nested)
return target;
}
@@ -574,6 +598,7 @@ const int SimpleMessage::kNumbersFieldNumber;
SimpleMessage::SimpleMessage()
: ::google::protobuf::Message() {
SharedCtor();
+ // @@protoc_insertion_point(constructor:tests.SimpleMessage)
}
void SimpleMessage::InitAsDefaultInstance() {
@@ -583,20 +608,23 @@ SimpleMessage::SimpleMessage(const SimpleMessage& from)
: ::google::protobuf::Message() {
SharedCtor();
MergeFrom(from);
+ // @@protoc_insertion_point(copy_constructor:tests.SimpleMessage)
}
void SimpleMessage::SharedCtor() {
+ ::google::protobuf::internal::GetEmptyString();
_cached_size_ = 0;
- id_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
SimpleMessage::~SimpleMessage() {
+ // @@protoc_insertion_point(destructor:tests.SimpleMessage)
SharedDtor();
}
void SimpleMessage::SharedDtor() {
- if (id_ != &::google::protobuf::internal::kEmptyString) {
+ if (id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete id_;
}
if (this != default_instance_) {
@@ -625,11 +653,9 @@ SimpleMessage* SimpleMessage::New() const {
}
void SimpleMessage::Clear() {
- if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
- if (has_id()) {
- if (id_ != &::google::protobuf::internal::kEmptyString) {
- id_->clear();
- }
+ if (has_id()) {
+ if (id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
+ id_->clear();
}
}
numbers_.Clear();
@@ -639,21 +665,25 @@ void SimpleMessage::Clear() {
bool SimpleMessage::MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
::google::protobuf::uint32 tag;
- while ((tag = input->ReadTag()) != 0) {
+ // @@protoc_insertion_point(parse_start:tests.SimpleMessage)
+ for (;;) {
+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+ tag = p.first;
+ if (!p.second) goto handle_unusual;
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// required string id = 1;
case 1: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 10) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_id()));
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->id().data(), this->id().length(),
- ::google::protobuf::internal::WireFormat::PARSE);
+ ::google::protobuf::internal::WireFormat::PARSE,
+ "id");
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(16)) goto parse_numbers;
break;
@@ -661,31 +691,29 @@ bool SimpleMessage::MergePartialFromCodedStream(
// repeated int32 numbers = 2;
case 2: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 16) {
parse_numbers:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
1, 16, input, this->mutable_numbers())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 18) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
input, this->mutable_numbers())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(16)) goto parse_numbers;
- if (input->ExpectAtEnd()) return true;
+ if (input->ExpectAtEnd()) goto success;
break;
}
default: {
- handle_uninterpreted:
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ handle_unusual:
+ if (tag == 0 ||
+ ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
- return true;
+ goto success;
}
DO_(::google::protobuf::internal::WireFormat::SkipField(
input, tag, mutable_unknown_fields()));
@@ -693,18 +721,25 @@ bool SimpleMessage::MergePartialFromCodedStream(
}
}
}
+success:
+ // @@protoc_insertion_point(parse_success:tests.SimpleMessage)
return true;
+failure:
+ // @@protoc_insertion_point(parse_failure:tests.SimpleMessage)
+ return false;
#undef DO_
}
void SimpleMessage::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
+ // @@protoc_insertion_point(serialize_start:tests.SimpleMessage)
// required string id = 1;
if (has_id()) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->id().data(), this->id().length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
- ::google::protobuf::internal::WireFormatLite::WriteString(
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "id");
+ ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
1, this->id(), output);
}
@@ -718,15 +753,18 @@ void SimpleMessage::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormat::SerializeUnknownFields(
unknown_fields(), output);
}
+ // @@protoc_insertion_point(serialize_end:tests.SimpleMessage)
}
::google::protobuf::uint8* SimpleMessage::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
+ // @@protoc_insertion_point(serialize_to_array_start:tests.SimpleMessage)
// required string id = 1;
if (has_id()) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->id().data(), this->id().length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "id");
target =
::google::protobuf::internal::WireFormatLite::WriteStringToArray(
1, this->id(), target);
@@ -742,6 +780,7 @@ void SimpleMessage::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
unknown_fields(), target);
}
+ // @@protoc_insertion_point(serialize_to_array_end:tests.SimpleMessage)
return target;
}
@@ -875,6 +914,7 @@ const int Message::kOptionalNoDefaultFieldNumber;
Message::Message()
: ::google::protobuf::Message() {
SharedCtor();
+ // @@protoc_insertion_point(constructor:tests.Message)
}
void Message::InitAsDefaultInstance() {
@@ -885,13 +925,15 @@ Message::Message(const Message& from)
: ::google::protobuf::Message() {
SharedCtor();
MergeFrom(from);
+ // @@protoc_insertion_point(copy_constructor:tests.Message)
}
void Message::SharedCtor() {
+ ::google::protobuf::internal::GetEmptyString();
_cached_size_ = 0;
b_ = false;
- str_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- bytes_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ str_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+ bytes_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
int32_ = 0;
int64_ = GOOGLE_LONGLONG(0);
uint32_ = 0u;
@@ -908,14 +950,15 @@ void Message::SharedCtor() {
}
Message::~Message() {
+ // @@protoc_insertion_point(destructor:tests.Message)
SharedDtor();
}
void Message::SharedDtor() {
- if (str_ != &::google::protobuf::internal::kEmptyString) {
+ if (str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete str_;
}
- if (bytes_ != &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
delete bytes_;
}
if (this != default_instance_) {
@@ -945,37 +988,45 @@ Message* Message::New() const {
}
void Message::Clear() {
- if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
- b_ = false;
+#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>( \
+ &reinterpret_cast<Message*>(16)->f) - \
+ reinterpret_cast<char*>(16))
+
+#define ZR_(first, last) do { \
+ size_t f = OFFSET_OF_FIELD_(first); \
+ size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \
+ ::memset(&first, 0, n); \
+ } while (0)
+
+ if (_has_bits_[0 / 32] & 255) {
+ ZR_(b_, int32_);
+ ZR_(int64_, sint32_);
if (has_str()) {
- if (str_ != &::google::protobuf::internal::kEmptyString) {
+ if (str_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
str_->clear();
}
}
if (has_bytes()) {
- if (bytes_ != &::google::protobuf::internal::kEmptyString) {
+ if (bytes_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
bytes_->clear();
}
}
- int32_ = 0;
- int64_ = GOOGLE_LONGLONG(0);
- uint32_ = 0u;
- uint64_ = GOOGLE_ULONGLONG(0);
- sint32_ = 0;
}
- if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
- sint64_ = GOOGLE_LONGLONG(0);
- f_ = 0;
- d_ = 0;
+ if (_has_bits_[8 / 32] & 7936) {
+ ZR_(sint64_, f_);
e_ = 1;
if (has_nested()) {
if (nested_ != NULL) nested_->::tests::Nested::Clear();
}
}
- if (_has_bits_[27 / 32] & (0xffu << (27 % 32))) {
+ if (_has_bits_[24 / 32] & 402653184) {
optional_default_ = 42;
optional_no_default_ = 0;
}
+
+#undef OFFSET_OF_FIELD_
+#undef ZR_
+
repeated_bool_.Clear();
repeated_string_.Clear();
repeated_bytes_.Clear();
@@ -996,21 +1047,25 @@ void Message::Clear() {
bool Message::MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
::google::protobuf::uint32 tag;
- while ((tag = input->ReadTag()) != 0) {
+ // @@protoc_insertion_point(parse_start:tests.Message)
+ for (;;) {
+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
+ tag = p.first;
+ if (!p.second) goto handle_unusual;
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// required string str = 1;
case 1: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 10) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_str()));
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->str().data(), this->str().length(),
- ::google::protobuf::internal::WireFormat::PARSE);
+ ::google::protobuf::internal::WireFormat::PARSE,
+ "str");
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(18)) goto parse_bytes;
break;
@@ -1018,13 +1073,12 @@ bool Message::MergePartialFromCodedStream(
// required bytes bytes = 2;
case 2: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 18) {
parse_bytes:
DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
input, this->mutable_bytes()));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(24)) goto parse_int32;
break;
@@ -1032,15 +1086,14 @@ bool Message::MergePartialFromCodedStream(
// optional int32 int32 = 3;
case 3: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 24) {
parse_int32:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
input, &int32_)));
set_has_int32();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(32)) goto parse_int64;
break;
@@ -1048,15 +1101,14 @@ bool Message::MergePartialFromCodedStream(
// optional int64 int64 = 4;
case 4: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 32) {
parse_int64:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
input, &int64_)));
set_has_int64();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(40)) goto parse_uint32;
break;
@@ -1064,15 +1116,14 @@ bool Message::MergePartialFromCodedStream(
// optional uint32 uint32 = 5;
case 5: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 40) {
parse_uint32:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
input, &uint32_)));
set_has_uint32();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(48)) goto parse_uint64;
break;
@@ -1080,15 +1131,14 @@ bool Message::MergePartialFromCodedStream(
// optional uint64 uint64 = 6;
case 6: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 48) {
parse_uint64:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
input, &uint64_)));
set_has_uint64();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(56)) goto parse_sint32;
break;
@@ -1096,15 +1146,14 @@ bool Message::MergePartialFromCodedStream(
// optional sint32 sint32 = 7;
case 7: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 56) {
parse_sint32:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_SINT32>(
input, &sint32_)));
set_has_sint32();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(64)) goto parse_sint64;
break;
@@ -1112,15 +1161,14 @@ bool Message::MergePartialFromCodedStream(
// optional sint64 sint64 = 8;
case 8: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 64) {
parse_sint64:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_SINT64>(
input, &sint64_)));
set_has_sint64();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(77)) goto parse_f;
break;
@@ -1128,15 +1176,14 @@ bool Message::MergePartialFromCodedStream(
// required float f = 9;
case 9: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+ if (tag == 77) {
parse_f:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
input, &f_)));
set_has_f();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(81)) goto parse_d;
break;
@@ -1144,15 +1191,14 @@ bool Message::MergePartialFromCodedStream(
// required double d = 10;
case 10: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+ if (tag == 81) {
parse_d:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
input, &d_)));
set_has_d();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(88)) goto parse_e;
break;
@@ -1160,8 +1206,7 @@ bool Message::MergePartialFromCodedStream(
// required .tests.Enum e = 11;
case 11: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 88) {
parse_e:
int value;
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
@@ -1173,7 +1218,7 @@ bool Message::MergePartialFromCodedStream(
mutable_unknown_fields()->AddVarint(11, value);
}
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(98)) goto parse_nested;
break;
@@ -1181,13 +1226,12 @@ bool Message::MergePartialFromCodedStream(
// required .tests.Nested nested = 12;
case 12: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 98) {
parse_nested:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_nested()));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(106)) goto parse_repeated_string;
break;
@@ -1195,17 +1239,17 @@ bool Message::MergePartialFromCodedStream(
// repeated string repeated_string = 13;
case 13: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 106) {
parse_repeated_string:
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->add_repeated_string()));
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->repeated_string(this->repeated_string_size() - 1).data(),
this->repeated_string(this->repeated_string_size() - 1).length(),
- ::google::protobuf::internal::WireFormat::PARSE);
+ ::google::protobuf::internal::WireFormat::PARSE,
+ "repeated_string");
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(106)) goto parse_repeated_string;
if (input->ExpectTag(114)) goto parse_repeated_bytes;
@@ -1214,13 +1258,12 @@ bool Message::MergePartialFromCodedStream(
// repeated bytes repeated_bytes = 14;
case 14: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 114) {
parse_repeated_bytes:
DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
input, this->add_repeated_bytes()));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(114)) goto parse_repeated_bytes;
if (input->ExpectTag(120)) goto parse_repeated_int32;
@@ -1229,20 +1272,17 @@ bool Message::MergePartialFromCodedStream(
// repeated int32 repeated_int32 = 15;
case 15: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 120) {
parse_repeated_int32:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
1, 120, input, this->mutable_repeated_int32())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 122) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
input, this->mutable_repeated_int32())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(120)) goto parse_repeated_int32;
if (input->ExpectTag(128)) goto parse_repeated_int64;
@@ -1251,20 +1291,17 @@ bool Message::MergePartialFromCodedStream(
// repeated int64 repeated_int64 = 16;
case 16: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 128) {
parse_repeated_int64:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
2, 128, input, this->mutable_repeated_int64())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 130) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
input, this->mutable_repeated_int64())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(128)) goto parse_repeated_int64;
if (input->ExpectTag(136)) goto parse_repeated_uint32;
@@ -1273,20 +1310,17 @@ bool Message::MergePartialFromCodedStream(
// repeated uint32 repeated_uint32 = 17;
case 17: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 136) {
parse_repeated_uint32:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
2, 136, input, this->mutable_repeated_uint32())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 138) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
input, this->mutable_repeated_uint32())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(136)) goto parse_repeated_uint32;
if (input->ExpectTag(144)) goto parse_repeated_uint64;
@@ -1295,20 +1329,17 @@ bool Message::MergePartialFromCodedStream(
// repeated uint64 repeated_uint64 = 18;
case 18: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 144) {
parse_repeated_uint64:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
2, 144, input, this->mutable_repeated_uint64())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 146) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
input, this->mutable_repeated_uint64())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(144)) goto parse_repeated_uint64;
if (input->ExpectTag(152)) goto parse_repeated_sint32;
@@ -1317,20 +1348,17 @@ bool Message::MergePartialFromCodedStream(
// repeated sint32 repeated_sint32 = 19;
case 19: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 152) {
parse_repeated_sint32:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_SINT32>(
2, 152, input, this->mutable_repeated_sint32())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 154) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_SINT32>(
input, this->mutable_repeated_sint32())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(152)) goto parse_repeated_sint32;
if (input->ExpectTag(160)) goto parse_repeated_sint64;
@@ -1339,20 +1367,17 @@ bool Message::MergePartialFromCodedStream(
// repeated sint64 repeated_sint64 = 20;
case 20: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 160) {
parse_repeated_sint64:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_SINT64>(
2, 160, input, this->mutable_repeated_sint64())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 162) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_SINT64>(
input, this->mutable_repeated_sint64())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(160)) goto parse_repeated_sint64;
if (input->ExpectTag(173)) goto parse_repeated_float;
@@ -1361,20 +1386,17 @@ bool Message::MergePartialFromCodedStream(
// repeated float repeated_float = 21;
case 21: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+ if (tag == 173) {
parse_repeated_float:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
2, 173, input, this->mutable_repeated_float())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 170) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
input, this->mutable_repeated_float())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(173)) goto parse_repeated_float;
if (input->ExpectTag(177)) goto parse_repeated_double;
@@ -1383,20 +1405,17 @@ bool Message::MergePartialFromCodedStream(
// repeated double repeated_double = 22;
case 22: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+ if (tag == 177) {
parse_repeated_double:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
2, 177, input, this->mutable_repeated_double())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 178) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
input, this->mutable_repeated_double())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(177)) goto parse_repeated_double;
if (input->ExpectTag(184)) goto parse_repeated_enum;
@@ -1405,8 +1424,7 @@ bool Message::MergePartialFromCodedStream(
// repeated .tests.Enum repeated_enum = 23;
case 23: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 184) {
parse_repeated_enum:
int value;
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
@@ -1417,15 +1435,13 @@ bool Message::MergePartialFromCodedStream(
} else {
mutable_unknown_fields()->AddVarint(23, value);
}
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 186) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedEnumNoInline(
input,
&::tests::Enum_IsValid,
this->mutable_repeated_enum())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(184)) goto parse_repeated_enum;
if (input->ExpectTag(194)) goto parse_repeated_nested;
@@ -1434,13 +1450,12 @@ bool Message::MergePartialFromCodedStream(
// repeated .tests.Nested repeated_nested = 24;
case 24: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 194) {
parse_repeated_nested:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, add_repeated_nested()));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(194)) goto parse_repeated_nested;
if (input->ExpectTag(202)) goto parse_empty;
@@ -1449,17 +1464,17 @@ bool Message::MergePartialFromCodedStream(
// repeated string empty = 25;
case 25: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 202) {
parse_empty:
DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->add_empty()));
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->empty(this->empty_size() - 1).data(),
this->empty(this->empty_size() - 1).length(),
- ::google::protobuf::internal::WireFormat::PARSE);
+ ::google::protobuf::internal::WireFormat::PARSE,
+ "empty");
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(202)) goto parse_empty;
if (input->ExpectTag(208)) goto parse_b;
@@ -1468,15 +1483,14 @@ bool Message::MergePartialFromCodedStream(
// required bool b = 26;
case 26: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 208) {
parse_b:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
input, &b_)));
set_has_b();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(216)) goto parse_repeated_bool;
break;
@@ -1484,20 +1498,17 @@ bool Message::MergePartialFromCodedStream(
// repeated bool repeated_bool = 27;
case 27: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ if (tag == 216) {
parse_repeated_bool:
DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
2, 216, input, this->mutable_repeated_bool())));
- } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
- == ::google::protobuf::internal::WireFormatLite::
- WIRETYPE_LENGTH_DELIMITED) {
+ } else if (tag == 218) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
input, this->mutable_repeated_bool())));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(216)) goto parse_repeated_bool;
if (input->ExpectTag(225)) goto parse_optional_default;
@@ -1506,15 +1517,14 @@ bool Message::MergePartialFromCodedStream(
// optional double optional_default = 28 [default = 42];
case 28: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+ if (tag == 225) {
parse_optional_default:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
input, &optional_default_)));
set_has_optional_default();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(233)) goto parse_optional_no_default;
break;
@@ -1522,25 +1532,25 @@ bool Message::MergePartialFromCodedStream(
// optional double optional_no_default = 29;
case 29: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+ if (tag == 233) {
parse_optional_no_default:
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
input, &optional_no_default_)));
set_has_optional_no_default();
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
- if (input->ExpectAtEnd()) return true;
+ if (input->ExpectAtEnd()) goto success;
break;
}
default: {
- handle_uninterpreted:
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ handle_unusual:
+ if (tag == 0 ||
+ ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
- return true;
+ goto success;
}
DO_(::google::protobuf::internal::WireFormat::SkipField(
input, tag, mutable_unknown_fields()));
@@ -1548,24 +1558,31 @@ bool Message::MergePartialFromCodedStream(
}
}
}
+success:
+ // @@protoc_insertion_point(parse_success:tests.Message)
return true;
+failure:
+ // @@protoc_insertion_point(parse_failure:tests.Message)
+ return false;
#undef DO_
}
void Message::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
+ // @@protoc_insertion_point(serialize_start:tests.Message)
// required string str = 1;
if (has_str()) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->str().data(), this->str().length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
- ::google::protobuf::internal::WireFormatLite::WriteString(
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "str");
+ ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
1, this->str(), output);
}
// required bytes bytes = 2;
if (has_bytes()) {
- ::google::protobuf::internal::WireFormatLite::WriteBytes(
+ ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased(
2, this->bytes(), output);
}
@@ -1623,9 +1640,10 @@ void Message::SerializeWithCachedSizes(
// repeated string repeated_string = 13;
for (int i = 0; i < this->repeated_string_size(); i++) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->repeated_string(i).data(), this->repeated_string(i).length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "repeated_string");
::google::protobuf::internal::WireFormatLite::WriteString(
13, this->repeated_string(i), output);
}
@@ -1698,9 +1716,10 @@ void Message::SerializeWithCachedSizes(
// repeated string empty = 25;
for (int i = 0; i < this->empty_size(); i++) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->empty(i).data(), this->empty(i).length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "empty");
::google::protobuf::internal::WireFormatLite::WriteString(
25, this->empty(i), output);
}
@@ -1730,15 +1749,18 @@ void Message::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormat::SerializeUnknownFields(
unknown_fields(), output);
}
+ // @@protoc_insertion_point(serialize_end:tests.Message)
}
::google::protobuf::uint8* Message::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
+ // @@protoc_insertion_point(serialize_to_array_start:tests.Message)
// required string str = 1;
if (has_str()) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->str().data(), this->str().length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "str");
target =
::google::protobuf::internal::WireFormatLite::WriteStringToArray(
1, this->str(), target);
@@ -1806,9 +1828,10 @@ void Message::SerializeWithCachedSizes(
// repeated string repeated_string = 13;
for (int i = 0; i < this->repeated_string_size(); i++) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->repeated_string(i).data(), this->repeated_string(i).length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "repeated_string");
target = ::google::protobuf::internal::WireFormatLite::
WriteStringToArray(13, this->repeated_string(i), target);
}
@@ -1882,9 +1905,10 @@ void Message::SerializeWithCachedSizes(
// repeated string empty = 25;
for (int i = 0; i < this->empty_size(); i++) {
- ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
this->empty(i).data(), this->empty(i).length(),
- ::google::protobuf::internal::WireFormat::SERIALIZE);
+ ::google::protobuf::internal::WireFormat::SERIALIZE,
+ "empty");
target = ::google::protobuf::internal::WireFormatLite::
WriteStringToArray(25, this->empty(i), target);
}
@@ -1914,6 +1938,7 @@ void Message::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
unknown_fields(), target);
}
+ // @@protoc_insertion_point(serialize_to_array_end:tests.Message)
return target;
}
@@ -2251,9 +2276,7 @@ bool Message::IsInitialized() const {
if (has_nested()) {
if (!this->nested().IsInitialized()) return false;
}
- for (int i = 0; i < repeated_nested_size(); i++) {
- if (!this->repeated_nested(i).IsInitialized()) return false;
- }
+ if (!::google::protobuf::internal::AllAreInitialized(this->repeated_nested())) return false;
return true;
}
@@ -2312,6 +2335,7 @@ const int ArrayMessage::kValuesFieldNumber;
ArrayMessage::ArrayMessage()
: ::google::protobuf::Message() {
SharedCtor();
+ // @@protoc_insertion_point(constructor:tests.ArrayMessage)
}
void ArrayMessage::InitAsDefaultInstance() {
@@ -2321,6 +2345,7 @@ ArrayMessage::ArrayMessage(const ArrayMessage& from)
: ::google::protobuf::Message() {
SharedCtor();
MergeFrom(from);
+ // @@protoc_insertion_point(copy_constructor:tests.ArrayMessage)
}
void ArrayMessage::SharedCtor() {
@@ -2329,6 +2354,7 @@ void ArrayMessage::SharedCtor() {
}
ArrayMessage::~ArrayMessage() {
+ // @@protoc_insertion_point(destructor:tests.ArrayMessage)
SharedDtor();
}
@@ -2366,30 +2392,34 @@ void ArrayMessage::Clear() {
bool ArrayMessage::MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
::google::protobuf::uint32 tag;
- while ((tag = input->ReadTag()) != 0) {
+ // @@protoc_insertion_point(parse_start:tests.ArrayMessage)
+ for (;;) {
+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
+ tag = p.first;
+ if (!p.second) goto handle_unusual;
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// repeated .tests.SimpleMessage values = 1;
case 1: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ if (tag == 10) {
parse_values:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, add_values()));
} else {
- goto handle_uninterpreted;
+ goto handle_unusual;
}
if (input->ExpectTag(10)) goto parse_values;
- if (input->ExpectAtEnd()) return true;
+ if (input->ExpectAtEnd()) goto success;
break;
}
default: {
- handle_uninterpreted:
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ handle_unusual:
+ if (tag == 0 ||
+ ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
- return true;
+ goto success;
}
DO_(::google::protobuf::internal::WireFormat::SkipField(
input, tag, mutable_unknown_fields()));
@@ -2397,12 +2427,18 @@ bool ArrayMessage::MergePartialFromCodedStream(
}
}
}
+success:
+ // @@protoc_insertion_point(parse_success:tests.ArrayMessage)
return true;
+failure:
+ // @@protoc_insertion_point(parse_failure:tests.ArrayMessage)
+ return false;
#undef DO_
}
void ArrayMessage::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
+ // @@protoc_insertion_point(serialize_start:tests.ArrayMessage)
// repeated .tests.SimpleMessage values = 1;
for (int i = 0; i < this->values_size(); i++) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
@@ -2413,10 +2449,12 @@ void ArrayMessage::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormat::SerializeUnknownFields(
unknown_fields(), output);
}
+ // @@protoc_insertion_point(serialize_end:tests.ArrayMessage)
}
::google::protobuf::uint8* ArrayMessage::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
+ // @@protoc_insertion_point(serialize_to_array_start:tests.ArrayMessage)
// repeated .tests.SimpleMessage values = 1;
for (int i = 0; i < this->values_size(); i++) {
target = ::google::protobuf::internal::WireFormatLite::
@@ -2428,6 +2466,7 @@ void ArrayMessage::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
unknown_fields(), target);
}
+ // @@protoc_insertion_point(serialize_to_array_end:tests.ArrayMessage)
return target;
}
@@ -2485,9 +2524,7 @@ void ArrayMessage::CopyFrom(const ArrayMessage& from) {
bool ArrayMessage::IsInitialized() const {
- for (int i = 0; i < values_size(); i++) {
- if (!this->values(i).IsInitialized()) return false;
- }
+ if (!::google::protobuf::internal::AllAreInitialized(this->values())) return false;
return true;
}
[3/4] mesos git commit: Upgrade protobuf to 2.6.1 to support PowerPC
LE platform [libprocess].
Posted by vi...@apache.org.
Upgrade protobuf to 2.6.1 to support PowerPC LE platform [libprocess].
Review: https://reviews.apache.org/r/45368/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/51872fba
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/51872fba
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/51872fba
Branch: refs/heads/master
Commit: 51872fba7f94d80e55c9cc9b46f96780a938f626
Parents: 24ad4ae
Author: Zhiwei Chen <zh...@gmail.com>
Authored: Thu Mar 31 10:08:50 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Mar 31 10:08:50 2016 -0700
----------------------------------------------------------------------
.../libprocess/3rdparty/protobuf-2.5.0.tar.gz | Bin 2401901 -> 0 bytes
.../libprocess/3rdparty/protobuf-2.6.1.tar.gz | Bin 0 -> 2641426 bytes
3rdparty/libprocess/3rdparty/versions.am | 2 +-
3 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/51872fba/3rdparty/libprocess/3rdparty/protobuf-2.5.0.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/protobuf-2.5.0.tar.gz b/3rdparty/libprocess/3rdparty/protobuf-2.5.0.tar.gz
deleted file mode 100644
index e600ac5..0000000
Binary files a/3rdparty/libprocess/3rdparty/protobuf-2.5.0.tar.gz and /dev/null differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/51872fba/3rdparty/libprocess/3rdparty/protobuf-2.6.1.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/protobuf-2.6.1.tar.gz b/3rdparty/libprocess/3rdparty/protobuf-2.6.1.tar.gz
new file mode 100644
index 0000000..e1c2d54
Binary files /dev/null and b/3rdparty/libprocess/3rdparty/protobuf-2.6.1.tar.gz differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/51872fba/3rdparty/libprocess/3rdparty/versions.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/versions.am b/3rdparty/libprocess/3rdparty/versions.am
index 462a867..7f5a618 100644
--- a/3rdparty/libprocess/3rdparty/versions.am
+++ b/3rdparty/libprocess/3rdparty/versions.am
@@ -7,6 +7,6 @@ GLOG_VERSION = 0.3.3
GMOCK_VERSION = 1.7.0
GPERFTOOLS_VERSION = 2.0
LIBEV_VERSION = 4.15
-PROTOBUF_VERSION = 2.5.0
+PROTOBUF_VERSION = 2.6.1
HTTP_PARSER_VERSION = 2.6.1
PICOJSON_VERSION = 1.3.0