From 1421e1771565037213e9d50e4d780103e9b9effc Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 20:35:40 +0800
Subject: [PATCH] panshen up date protobuf
---
FaceServer/PbFaceList.pb.h | 26 ++--
FaceServer/PbFaceList.pb.cc | 218 ++++++++++++++++++++++++++----------------
2 files changed, 147 insertions(+), 97 deletions(-)
diff --git a/FaceServer/PbFaceList.pb.cc b/FaceServer/PbFaceList.pb.cc
index 5550951..0f6c4cf 100644
--- a/FaceServer/PbFaceList.pb.cc
+++ b/FaceServer/PbFaceList.pb.cc
@@ -31,11 +31,27 @@
} // namespace
+PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTableField
+ const TableStruct::entries[] = {
+ {0, 0, 0, ::google::protobuf::internal::kInvalidMask, 0, 0},
+};
+
+PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::AuxillaryParseTableField
+ const TableStruct::aux[] = {
+ ::google::protobuf::internal::AuxillaryParseTableField(),
+};
+PROTOBUF_CONSTEXPR_VAR ::google::protobuf::internal::ParseTable const
+ TableStruct::schema[] = {
+ { NULL, NULL, 0, -1, -1, false },
+ { NULL, NULL, 0, -1, -1, false },
+};
+
const ::google::protobuf::uint32 TableStruct::offsets[] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList_FaceListImage, _has_bits_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList_FaceListImage, _internal_metadata_),
~0u, // no _extensions_
~0u, // no _oneof_case_
+ ~0u, // no _weak_field_map_
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList_FaceListImage, idx_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList_FaceListImage, st_track_id_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList_FaceListImage, size_),
@@ -58,6 +74,7 @@
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList, _internal_metadata_),
~0u, // no _extensions_
~0u, // no _oneof_case_
+ ~0u, // no _weak_field_map_
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList, magic_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList, image_count_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PbFaceList, src_width_),
@@ -71,8 +88,8 @@
};
static const ::google::protobuf::internal::MigrationSchema schemas[] = {
- { 0, 13, sizeof(PbFaceList_FaceListImage)},
- { 22, 31, sizeof(PbFaceList)},
+ { 0, 14, sizeof(PbFaceList_FaceListImage)},
+ { 23, 33, sizeof(PbFaceList)},
};
static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -155,7 +172,7 @@
static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl);
}
-// Force AddDescriptors() to be called at static initialization time.
+// Force AddDescriptors() to be called at dynamic initialization time.
struct StaticDescriptorInitializer {
StaticDescriptorInitializer() {
AddDescriptors();
@@ -250,15 +267,16 @@
img_(from.img_) {
_internal_metadata_.MergeFrom(from._internal_metadata_);
::memcpy(&idx_, &from.idx_,
- reinterpret_cast<char*>(&type_) -
- reinterpret_cast<char*>(&idx_) + sizeof(type_));
+ static_cast<size_t>(reinterpret_cast<char*>(&type_) -
+ reinterpret_cast<char*>(&idx_)) + sizeof(type_));
// @@protoc_insertion_point(copy_constructor:PbFaceList.FaceListImage)
}
void PbFaceList_FaceListImage::SharedCtor() {
_cached_size_ = 0;
- ::memset(&idx_, 0, reinterpret_cast<char*>(&top_left_y_) -
- reinterpret_cast<char*>(&idx_) + sizeof(top_left_y_));
+ ::memset(&idx_, 0, static_cast<size_t>(
+ reinterpret_cast<char*>(&top_left_y_) -
+ reinterpret_cast<char*>(&idx_)) + sizeof(top_left_y_));
type_ = 9;
}
@@ -277,7 +295,7 @@
}
const ::google::protobuf::Descriptor* PbFaceList_FaceListImage::descriptor() {
protobuf_PbFaceList::protobuf_AssignDescriptorsOnce();
- return protobuf_PbFaceList::file_level_metadata[0].descriptor;
+ return protobuf_PbFaceList::file_level_metadata[kIndexInFileMessages].descriptor;
}
const PbFaceList_FaceListImage& PbFaceList_FaceListImage::default_instance() {
@@ -297,8 +315,9 @@
// @@protoc_insertion_point(message_clear_start:PbFaceList.FaceListImage)
img_.Clear();
if (_has_bits_[0 / 32] & 255u) {
- ::memset(&idx_, 0, reinterpret_cast<char*>(&top_left_y_) -
- reinterpret_cast<char*>(&idx_) + sizeof(top_left_y_));
+ ::memset(&idx_, 0, static_cast<size_t>(
+ reinterpret_cast<char*>(&top_left_y_) -
+ reinterpret_cast<char*>(&idx_)) + sizeof(top_left_y_));
type_ = 9;
}
_has_bits_.Clear();
@@ -368,7 +387,8 @@
if (::PbFaceList_FaceListImage_ImageType_IsValid(value)) {
set_type(static_cast< ::PbFaceList_FaceListImage_ImageType >(value));
} else {
- mutable_unknown_fields()->AddVarint(4, value);
+ mutable_unknown_fields()->AddVarint(
+ 4, static_cast< ::google::protobuf::uint64>(value));
}
} else {
goto handle_unusual;
@@ -469,44 +489,48 @@
void PbFaceList_FaceListImage::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
// @@protoc_insertion_point(serialize_start:PbFaceList.FaceListImage)
+ ::google::protobuf::uint32 cached_has_bits = 0;
+ (void) cached_has_bits;
+
+ cached_has_bits = _has_bits_[0];
// required uint32 idx = 1;
- if (has_idx()) {
+ if (cached_has_bits & 0x00000001u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->idx(), output);
}
// required uint32 st_track_id = 2;
- if (has_st_track_id()) {
+ if (cached_has_bits & 0x00000002u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->st_track_id(), output);
}
// required uint32 size = 3;
- if (has_size()) {
+ if (cached_has_bits & 0x00000004u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->size(), output);
}
// required .PbFaceList.FaceListImage.ImageType type = 4 [default = MBFT_Y8];
- if (has_type()) {
+ if (cached_has_bits & 0x00000080u) {
::google::protobuf::internal::WireFormatLite::WriteEnum(
4, this->type(), output);
}
// required uint32 width = 5;
- if (has_width()) {
+ if (cached_has_bits & 0x00000008u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->width(), output);
}
// required uint32 height = 6;
- if (has_height()) {
+ if (cached_has_bits & 0x00000010u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(6, this->height(), output);
}
// optional uint32 top_left_x = 7;
- if (has_top_left_x()) {
+ if (cached_has_bits & 0x00000020u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->top_left_x(), output);
}
// optional uint32 top_left_y = 8;
- if (has_top_left_y()) {
+ if (cached_has_bits & 0x00000040u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->top_left_y(), output);
}
@@ -525,46 +549,50 @@
::google::protobuf::uint8* PbFaceList_FaceListImage::InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* target) const {
- (void)deterministic; // Unused
+ (void)deterministic; // Unused
// @@protoc_insertion_point(serialize_to_array_start:PbFaceList.FaceListImage)
+ ::google::protobuf::uint32 cached_has_bits = 0;
+ (void) cached_has_bits;
+
+ cached_has_bits = _has_bits_[0];
// required uint32 idx = 1;
- if (has_idx()) {
+ if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->idx(), target);
}
// required uint32 st_track_id = 2;
- if (has_st_track_id()) {
+ if (cached_has_bits & 0x00000002u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->st_track_id(), target);
}
// required uint32 size = 3;
- if (has_size()) {
+ if (cached_has_bits & 0x00000004u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->size(), target);
}
// required .PbFaceList.FaceListImage.ImageType type = 4 [default = MBFT_Y8];
- if (has_type()) {
+ if (cached_has_bits & 0x00000080u) {
target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
4, this->type(), target);
}
// required uint32 width = 5;
- if (has_width()) {
+ if (cached_has_bits & 0x00000008u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->width(), target);
}
// required uint32 height = 6;
- if (has_height()) {
+ if (cached_has_bits & 0x00000010u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(6, this->height(), target);
}
// optional uint32 top_left_x = 7;
- if (has_top_left_x()) {
+ if (cached_has_bits & 0x00000020u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->top_left_x(), target);
}
// optional uint32 top_left_y = 8;
- if (has_top_left_y()) {
+ if (cached_has_bits & 0x00000040u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->top_left_y(), target);
}
@@ -721,32 +749,37 @@
// @@protoc_insertion_point(class_specific_merge_from_start:PbFaceList.FaceListImage)
GOOGLE_DCHECK_NE(&from, this);
_internal_metadata_.MergeFrom(from._internal_metadata_);
+ ::google::protobuf::uint32 cached_has_bits = 0;
+ (void) cached_has_bits;
+
img_.MergeFrom(from.img_);
- if (from._has_bits_[0 / 32] & 255u) {
- if (from.has_idx()) {
- set_idx(from.idx());
+ cached_has_bits = from._has_bits_[0];
+ if (cached_has_bits & 255u) {
+ if (cached_has_bits & 0x00000001u) {
+ idx_ = from.idx_;
}
- if (from.has_st_track_id()) {
- set_st_track_id(from.st_track_id());
+ if (cached_has_bits & 0x00000002u) {
+ st_track_id_ = from.st_track_id_;
}
- if (from.has_size()) {
- set_size(from.size());
+ if (cached_has_bits & 0x00000004u) {
+ size_ = from.size_;
}
- if (from.has_width()) {
- set_width(from.width());
+ if (cached_has_bits & 0x00000008u) {
+ width_ = from.width_;
}
- if (from.has_height()) {
- set_height(from.height());
+ if (cached_has_bits & 0x00000010u) {
+ height_ = from.height_;
}
- if (from.has_top_left_x()) {
- set_top_left_x(from.top_left_x());
+ if (cached_has_bits & 0x00000020u) {
+ top_left_x_ = from.top_left_x_;
}
- if (from.has_top_left_y()) {
- set_top_left_y(from.top_left_y());
+ if (cached_has_bits & 0x00000040u) {
+ top_left_y_ = from.top_left_y_;
}
- if (from.has_type()) {
- set_type(from.type());
+ if (cached_has_bits & 0x00000080u) {
+ type_ = from.type_;
}
+ _has_bits_[0] |= cached_has_bits;
}
}
@@ -774,7 +807,7 @@
InternalSwap(other);
}
void PbFaceList_FaceListImage::InternalSwap(PbFaceList_FaceListImage* other) {
- img_.UnsafeArenaSwap(&other->img_);
+ img_.InternalSwap(&other->img_);
std::swap(idx_, other->idx_);
std::swap(st_track_id_, other->st_track_id_);
std::swap(size_, other->size_);
@@ -790,7 +823,7 @@
::google::protobuf::Metadata PbFaceList_FaceListImage::GetMetadata() const {
protobuf_PbFaceList::protobuf_AssignDescriptorsOnce();
- return protobuf_PbFaceList::file_level_metadata[0];
+ return protobuf_PbFaceList::file_level_metadata[kIndexInFileMessages];
}
#if PROTOBUF_INLINE_NOT_IN_HEADERS
@@ -1015,6 +1048,7 @@
}
#endif
void PbFaceList_FaceListImage::set_img(int index, const char* value) {
+ GOOGLE_DCHECK(value != NULL);
img_.Mutable(index)->assign(value);
// @@protoc_insertion_point(field_set_char:PbFaceList.FaceListImage.img)
}
@@ -1033,11 +1067,12 @@
}
#if LANG_CXX11
void PbFaceList_FaceListImage::add_img(::std::string&& value) {
- img_.Add()->assign(std::move(value));
+ img_.Add(std::move(value));
// @@protoc_insertion_point(field_add:PbFaceList.FaceListImage.img)
}
#endif
void PbFaceList_FaceListImage::add_img(const char* value) {
+ GOOGLE_DCHECK(value != NULL);
img_.Add()->assign(value);
// @@protoc_insertion_point(field_add_char:PbFaceList.FaceListImage.img)
}
@@ -1084,15 +1119,16 @@
images_(from.images_) {
_internal_metadata_.MergeFrom(from._internal_metadata_);
::memcpy(&image_count_, &from.image_count_,
- reinterpret_cast<char*>(&magic_) -
- reinterpret_cast<char*>(&image_count_) + sizeof(magic_));
+ static_cast<size_t>(reinterpret_cast<char*>(&magic_) -
+ reinterpret_cast<char*>(&image_count_)) + sizeof(magic_));
// @@protoc_insertion_point(copy_constructor:PbFaceList)
}
void PbFaceList::SharedCtor() {
_cached_size_ = 0;
- ::memset(&image_count_, 0, reinterpret_cast<char*>(&src_height_) -
- reinterpret_cast<char*>(&image_count_) + sizeof(src_height_));
+ ::memset(&image_count_, 0, static_cast<size_t>(
+ reinterpret_cast<char*>(&src_height_) -
+ reinterpret_cast<char*>(&image_count_)) + sizeof(src_height_));
magic_ = 11706629u;
}
@@ -1111,7 +1147,7 @@
}
const ::google::protobuf::Descriptor* PbFaceList::descriptor() {
protobuf_PbFaceList::protobuf_AssignDescriptorsOnce();
- return protobuf_PbFaceList::file_level_metadata[1].descriptor;
+ return protobuf_PbFaceList::file_level_metadata[kIndexInFileMessages].descriptor;
}
const PbFaceList& PbFaceList::default_instance() {
@@ -1131,8 +1167,9 @@
// @@protoc_insertion_point(message_clear_start:PbFaceList)
images_.Clear();
if (_has_bits_[0 / 32] & 15u) {
- ::memset(&image_count_, 0, reinterpret_cast<char*>(&src_height_) -
- reinterpret_cast<char*>(&image_count_) + sizeof(src_height_));
+ ::memset(&image_count_, 0, static_cast<size_t>(
+ reinterpret_cast<char*>(&src_height_) -
+ reinterpret_cast<char*>(&image_count_)) + sizeof(src_height_));
magic_ = 11706629u;
}
_has_bits_.Clear();
@@ -1209,13 +1246,11 @@
case 5: {
if (static_cast< ::google::protobuf::uint8>(tag) ==
static_cast< ::google::protobuf::uint8>(42u)) {
- DO_(input->IncrementRecursionDepth());
- DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
+ DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, add_images()));
} else {
goto handle_unusual;
}
- input->UnsafeDecrementRecursionDepth();
break;
}
@@ -1244,30 +1279,35 @@
void PbFaceList::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
// @@protoc_insertion_point(serialize_start:PbFaceList)
+ ::google::protobuf::uint32 cached_has_bits = 0;
+ (void) cached_has_bits;
+
+ cached_has_bits = _has_bits_[0];
// required uint32 magic = 1 [default = 11706629];
- if (has_magic()) {
+ if (cached_has_bits & 0x00000008u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->magic(), output);
}
// required uint32 image_count = 2;
- if (has_image_count()) {
+ if (cached_has_bits & 0x00000001u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->image_count(), output);
}
// optional uint32 src_width = 3;
- if (has_src_width()) {
+ if (cached_has_bits & 0x00000002u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->src_width(), output);
}
// optional uint32 src_height = 4;
- if (has_src_height()) {
+ if (cached_has_bits & 0x00000004u) {
::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->src_height(), output);
}
// repeated .PbFaceList.FaceListImage images = 5;
- for (unsigned int i = 0, n = this->images_size(); i < n; i++) {
+ for (unsigned int i = 0,
+ n = static_cast<unsigned int>(this->images_size()); i < n; i++) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
- 5, this->images(i), output);
+ 5, this->images(static_cast<int>(i)), output);
}
if (_internal_metadata_.have_unknown_fields()) {
@@ -1279,33 +1319,38 @@
::google::protobuf::uint8* PbFaceList::InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* target) const {
- (void)deterministic; // Unused
+ (void)deterministic; // Unused
// @@protoc_insertion_point(serialize_to_array_start:PbFaceList)
+ ::google::protobuf::uint32 cached_has_bits = 0;
+ (void) cached_has_bits;
+
+ cached_has_bits = _has_bits_[0];
// required uint32 magic = 1 [default = 11706629];
- if (has_magic()) {
+ if (cached_has_bits & 0x00000008u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->magic(), target);
}
// required uint32 image_count = 2;
- if (has_image_count()) {
+ if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->image_count(), target);
}
// optional uint32 src_width = 3;
- if (has_src_width()) {
+ if (cached_has_bits & 0x00000002u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->src_width(), target);
}
// optional uint32 src_height = 4;
- if (has_src_height()) {
+ if (cached_has_bits & 0x00000004u) {
target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->src_height(), target);
}
// repeated .PbFaceList.FaceListImage images = 5;
- for (unsigned int i = 0, n = this->images_size(); i < n; i++) {
+ for (unsigned int i = 0,
+ n = static_cast<unsigned int>(this->images_size()); i < n; i++) {
target = ::google::protobuf::internal::WireFormatLite::
InternalWriteMessageNoVirtualToArray(
- 5, this->images(i), false, target);
+ 5, this->images(static_cast<int>(i)), deterministic, target);
}
if (_internal_metadata_.have_unknown_fields()) {
@@ -1361,12 +1406,12 @@
}
// repeated .PbFaceList.FaceListImage images = 5;
{
- unsigned int count = this->images_size();
+ unsigned int count = static_cast<unsigned int>(this->images_size());
total_size += 1UL * count;
for (unsigned int i = 0; i < count; i++) {
total_size +=
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
- this->images(i));
+ this->images(static_cast<int>(i)));
}
}
@@ -1412,20 +1457,25 @@
// @@protoc_insertion_point(class_specific_merge_from_start:PbFaceList)
GOOGLE_DCHECK_NE(&from, this);
_internal_metadata_.MergeFrom(from._internal_metadata_);
+ ::google::protobuf::uint32 cached_has_bits = 0;
+ (void) cached_has_bits;
+
images_.MergeFrom(from.images_);
- if (from._has_bits_[0 / 32] & 15u) {
- if (from.has_image_count()) {
- set_image_count(from.image_count());
+ cached_has_bits = from._has_bits_[0];
+ if (cached_has_bits & 15u) {
+ if (cached_has_bits & 0x00000001u) {
+ image_count_ = from.image_count_;
}
- if (from.has_src_width()) {
- set_src_width(from.src_width());
+ if (cached_has_bits & 0x00000002u) {
+ src_width_ = from.src_width_;
}
- if (from.has_src_height()) {
- set_src_height(from.src_height());
+ if (cached_has_bits & 0x00000004u) {
+ src_height_ = from.src_height_;
}
- if (from.has_magic()) {
- set_magic(from.magic());
+ if (cached_has_bits & 0x00000008u) {
+ magic_ = from.magic_;
}
+ _has_bits_[0] |= cached_has_bits;
}
}
@@ -1454,7 +1504,7 @@
InternalSwap(other);
}
void PbFaceList::InternalSwap(PbFaceList* other) {
- images_.UnsafeArenaSwap(&other->images_);
+ images_.InternalSwap(&other->images_);
std::swap(image_count_, other->image_count_);
std::swap(src_width_, other->src_width_);
std::swap(src_height_, other->src_height_);
@@ -1466,7 +1516,7 @@
::google::protobuf::Metadata PbFaceList::GetMetadata() const {
protobuf_PbFaceList::protobuf_AssignDescriptorsOnce();
- return protobuf_PbFaceList::file_level_metadata[1];
+ return protobuf_PbFaceList::file_level_metadata[kIndexInFileMessages];
}
#if PROTOBUF_INLINE_NOT_IN_HEADERS
diff --git a/FaceServer/PbFaceList.pb.h b/FaceServer/PbFaceList.pb.h
index 9a00cfc..cc4dc58 100644
--- a/FaceServer/PbFaceList.pb.h
+++ b/FaceServer/PbFaceList.pb.h
@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
-#if GOOGLE_PROTOBUF_VERSION < 3002000
+#if GOOGLE_PROTOBUF_VERSION < 3003000
#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 3002000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3003002 < 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.
@@ -22,6 +22,7 @@
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/arena.h>
#include <google/protobuf/arenastring.h>
+#include <google/protobuf/generated_message_table_driven.h>
#include <google/protobuf/generated_message_util.h>
#include <google/protobuf/metadata.h>
#include <google/protobuf/message.h>
@@ -40,6 +41,9 @@
namespace protobuf_PbFaceList {
// Internal implementation detail -- do not call these.
struct TableStruct {
+ static const ::google::protobuf::internal::ParseTableField entries[];
+ static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
+ static const ::google::protobuf::internal::ParseTable schema[];
static const ::google::protobuf::uint32 offsets[];
static void InitDefaultsImpl();
static void Shutdown();
@@ -113,6 +117,8 @@
return reinterpret_cast<const PbFaceList_FaceListImage*>(
&_PbFaceList_FaceListImage_default_instance_);
}
+ static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
+ 0;
void Swap(PbFaceList_FaceListImage* other);
@@ -135,11 +141,6 @@
::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output)
- const PROTOBUF_FINAL {
- return InternalSerializeWithCachedSizesToArray(
- ::google::protobuf::io::CodedOutputStream::IsDefaultSerializationDeterministic(), output);
- }
int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
private:
void SharedCtor();
@@ -364,6 +365,8 @@
return reinterpret_cast<const PbFaceList*>(
&_PbFaceList_default_instance_);
}
+ static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
+ 1;
void Swap(PbFaceList* other);
@@ -386,11 +389,6 @@
::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output)
- const PROTOBUF_FINAL {
- return InternalSerializeWithCachedSizesToArray(
- ::google::protobuf::io::CodedOutputStream::IsDefaultSerializationDeterministic(), output);
- }
int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
private:
void SharedCtor();
@@ -705,6 +703,7 @@
}
#endif
inline void PbFaceList_FaceListImage::set_img(int index, const char* value) {
+ GOOGLE_DCHECK(value != NULL);
img_.Mutable(index)->assign(value);
// @@protoc_insertion_point(field_set_char:PbFaceList.FaceListImage.img)
}
@@ -723,11 +722,12 @@
}
#if LANG_CXX11
inline void PbFaceList_FaceListImage::add_img(::std::string&& value) {
- img_.Add()->assign(std::move(value));
+ img_.Add(std::move(value));
// @@protoc_insertion_point(field_add:PbFaceList.FaceListImage.img)
}
#endif
inline void PbFaceList_FaceListImage::add_img(const char* value) {
+ GOOGLE_DCHECK(value != NULL);
img_.Add()->assign(value);
// @@protoc_insertion_point(field_add_char:PbFaceList.FaceListImage.img)
}
--
Gitblit v1.8.0