From 362e197e21b13a142904ec297444bce9ea2138dd Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 20:37:19 +0800
Subject: [PATCH] panshen up date protobuf
---
FaceServer/PbFaceList.pb.h | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/FaceServer/PbFaceList.pb.h b/FaceServer/PbFaceList.pb.h
index cc4dc58..9a00cfc 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 < 3003000
+#if GOOGLE_PROTOBUF_VERSION < 3002000
#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 3003002 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3002000 < 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,7 +22,6 @@
#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>
@@ -41,9 +40,6 @@
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();
@@ -117,8 +113,6 @@
return reinterpret_cast<const PbFaceList_FaceListImage*>(
&_PbFaceList_FaceListImage_default_instance_);
}
- static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
- 0;
void Swap(PbFaceList_FaceListImage* other);
@@ -141,6 +135,11 @@
::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();
@@ -365,8 +364,6 @@
return reinterpret_cast<const PbFaceList*>(
&_PbFaceList_default_instance_);
}
- static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
- 1;
void Swap(PbFaceList* other);
@@ -389,6 +386,11 @@
::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();
@@ -703,7 +705,6 @@
}
#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)
}
@@ -722,12 +723,11 @@
}
#if LANG_CXX11
inline void PbFaceList_FaceListImage::add_img(::std::string&& value) {
- img_.Add(std::move(value));
+ img_.Add()->assign(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