diff --git a/Makefile b/Makefile
index 448d7823c76004c5fd0f1e71cb618708d55e7d8a..42b29e47d24999eed9301e7e4d10faeb43669f2c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ INC_DIR=/usr/local/omniORB/include \
/usr/local/boost/include \
/usr/local/soci/include \
/usr/local/soci/include/soci \
- /usr/include/mariadb \
+ /usr/include/mysql \
/usr/include/soci \
/usr/local/protobuf/include \
./src
@@ -30,7 +30,7 @@ CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG
CXX_RELEASE_FLAGS=-O3
CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x -Wno-unused-local-typedefs -DHAVE_BOOST -DBOOST_BIND_GLOBAL_PLACEHOLDERS
LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \
- -lsoci_core -lsoci_mysql -lmariadbclient -lboost_system -lboost_thread \
+ -lsoci_core -lsoci_mysql -lmariadb -lboost_system -lboost_thread \
-lboost_filesystem -lboost_date_time -lprotobuf -lssl -lcrypto -lpthread
INC_NO_WARNINGS=-isystem /usr/local/tango/include/tango
INC_PARM=$(foreach d, $(INC_DIR), -I$d) $(INC_NO_WARNINGS)
diff --git a/src/Request.pb.cc b/src/Request.pb.cc
index 4efa820daf15124cf1a9292c6b3404c7c1b39da9..ea58a60771a24f09bd7cf68ad88e18246490246f 100644
--- a/src/Request.pb.cc
+++ b/src/Request.pb.cc
@@ -28,7 +28,6 @@ static void InitDefaultsscc_info_Request_Request_2eproto() {
new (ptr) ::DataExporter_ns::Request();
::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);
}
- ::DataExporter_ns::Request::InitAsDefaultInstance();
}
::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Request_Request_2eproto =
@@ -90,8 +89,6 @@ namespace DataExporter_ns {
// ===================================================================
-void Request::InitAsDefaultInstance() {
-}
class Request::_Internal {
public:
using HasBits = decltype(std::declval<Request>()._has_bits_);
@@ -130,27 +127,27 @@ Request::Request(const Request& from)
_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
username_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (from._internal_has_username()) {
- username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_username(),
+ username_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_username(),
GetArena());
}
password_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (from._internal_has_password()) {
- password_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_password(),
+ password_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_password(),
GetArena());
}
schema_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (from._internal_has_schema()) {
- schema_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_schema(),
+ schema_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_schema(),
GetArena());
}
table_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (from._internal_has_table()) {
- table_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_table(),
+ table_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_table(),
GetArena());
}
file_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (from._internal_has_file_name()) {
- file_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_file_name(),
+ file_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_file_name(),
GetArena());
}
file_version_ = from.file_version_;
@@ -229,7 +226,6 @@ void Request::Clear() {
const char* Request::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
_Internal::HasBits has_bits{};
- ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
diff --git a/src/Request.pb.h b/src/Request.pb.h
index c9772c4b6bca8948850bab8c9d95d0284aaf1d86..0eaeb688ea37af1c6353ca9e4e234df42c18af12 100644
--- a/src/Request.pb.h
+++ b/src/Request.pb.h
@@ -8,12 +8,12 @@
#include <string>
#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3012000
+#if PROTOBUF_VERSION < 3014000
#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 3012004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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.
@@ -25,7 +25,6 @@
#include <google/protobuf/arenastring.h>
#include <google/protobuf/generated_message_table_driven.h>
#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/inlined_string_field.h>
#include <google/protobuf/metadata_lite.h>
#include <google/protobuf/generated_message_reflection.h>
#include <google/protobuf/message.h>
@@ -45,7 +44,7 @@ PROTOBUF_NAMESPACE_CLOSE
struct TableStruct_Request_2eproto {
static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
- static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[]
+ static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
@@ -69,7 +68,7 @@ namespace DataExporter_ns {
class Request PROTOBUF_FINAL :
public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:DataExporter_ns.Request) */ {
public:
- inline Request() : Request(nullptr) {};
+ inline Request() : Request(nullptr) {}
virtual ~Request();
Request(const Request& from);
@@ -109,7 +108,6 @@ class Request PROTOBUF_FINAL :
}
static const Request& default_instance();
- static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY
static inline const Request* internal_default_instance() {
return reinterpret_cast<const Request*>(
&_Request_default_instance_);
@@ -207,15 +205,6 @@ class Request PROTOBUF_FINAL :
std::string* mutable_username();
std::string* release_username();
void set_allocated_username(std::string* username);
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- std::string* unsafe_arena_release_username();
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- void unsafe_arena_set_allocated_username(
- std::string* username);
private:
const std::string& _internal_username() const;
void _internal_set_username(const std::string& value);
@@ -236,15 +225,6 @@ class Request PROTOBUF_FINAL :
std::string* mutable_password();
std::string* release_password();
void set_allocated_password(std::string* password);
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- std::string* unsafe_arena_release_password();
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- void unsafe_arena_set_allocated_password(
- std::string* password);
private:
const std::string& _internal_password() const;
void _internal_set_password(const std::string& value);
@@ -265,15 +245,6 @@ class Request PROTOBUF_FINAL :
std::string* mutable_schema();
std::string* release_schema();
void set_allocated_schema(std::string* schema);
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- std::string* unsafe_arena_release_schema();
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- void unsafe_arena_set_allocated_schema(
- std::string* schema);
private:
const std::string& _internal_schema() const;
void _internal_set_schema(const std::string& value);
@@ -294,15 +265,6 @@ class Request PROTOBUF_FINAL :
std::string* mutable_table();
std::string* release_table();
void set_allocated_table(std::string* table);
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- std::string* unsafe_arena_release_table();
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- void unsafe_arena_set_allocated_table(
- std::string* table);
private:
const std::string& _internal_table() const;
void _internal_set_table(const std::string& value);
@@ -323,15 +285,6 @@ class Request PROTOBUF_FINAL :
std::string* mutable_file_name();
std::string* release_file_name();
void set_allocated_file_name(std::string* file_name);
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- std::string* unsafe_arena_release_file_name();
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- void unsafe_arena_set_allocated_file_name(
- std::string* file_name);
private:
const std::string& _internal_file_name() const;
void _internal_set_file_name(const std::string& value);
@@ -391,7 +344,7 @@ inline bool Request::has_username() const {
return _internal_has_username();
}
inline void Request::clear_username() {
- username_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ username_.ClearToEmpty();
_has_bits_[0] &= ~0x00000001u;
}
inline const std::string& Request::username() const {
@@ -411,31 +364,30 @@ inline const std::string& Request::_internal_username() const {
}
inline void Request::_internal_set_username(const std::string& value) {
_has_bits_[0] |= 0x00000001u;
- username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+ username_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
}
inline void Request::set_username(std::string&& value) {
_has_bits_[0] |= 0x00000001u;
username_.Set(
- &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+ ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
// @@protoc_insertion_point(field_set_rvalue:DataExporter_ns.Request.username)
}
inline void Request::set_username(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_has_bits_[0] |= 0x00000001u;
- username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
- GetArena());
+ username_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(value), GetArena());
// @@protoc_insertion_point(field_set_char:DataExporter_ns.Request.username)
}
inline void Request::set_username(const char* value,
size_t size) {
_has_bits_[0] |= 0x00000001u;
- username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+ username_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
reinterpret_cast<const char*>(value), size), GetArena());
// @@protoc_insertion_point(field_set_pointer:DataExporter_ns.Request.username)
}
inline std::string* Request::_internal_mutable_username() {
_has_bits_[0] |= 0x00000001u;
- return username_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ return username_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
}
inline std::string* Request::release_username() {
// @@protoc_insertion_point(field_release:DataExporter_ns.Request.username)
@@ -455,25 +407,6 @@ inline void Request::set_allocated_username(std::string* username) {
GetArena());
// @@protoc_insertion_point(field_set_allocated:DataExporter_ns.Request.username)
}
-inline std::string* Request::unsafe_arena_release_username() {
- // @@protoc_insertion_point(field_unsafe_arena_release:DataExporter_ns.Request.username)
- GOOGLE_DCHECK(GetArena() != nullptr);
- _has_bits_[0] &= ~0x00000001u;
- return username_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- GetArena());
-}
-inline void Request::unsafe_arena_set_allocated_username(
- std::string* username) {
- GOOGLE_DCHECK(GetArena() != nullptr);
- if (username != nullptr) {
- _has_bits_[0] |= 0x00000001u;
- } else {
- _has_bits_[0] &= ~0x00000001u;
- }
- username_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- username, GetArena());
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DataExporter_ns.Request.username)
-}
// required string password = 2;
inline bool Request::_internal_has_password() const {
@@ -484,7 +417,7 @@ inline bool Request::has_password() const {
return _internal_has_password();
}
inline void Request::clear_password() {
- password_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ password_.ClearToEmpty();
_has_bits_[0] &= ~0x00000002u;
}
inline const std::string& Request::password() const {
@@ -504,31 +437,30 @@ inline const std::string& Request::_internal_password() const {
}
inline void Request::_internal_set_password(const std::string& value) {
_has_bits_[0] |= 0x00000002u;
- password_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+ password_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
}
inline void Request::set_password(std::string&& value) {
_has_bits_[0] |= 0x00000002u;
password_.Set(
- &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+ ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
// @@protoc_insertion_point(field_set_rvalue:DataExporter_ns.Request.password)
}
inline void Request::set_password(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_has_bits_[0] |= 0x00000002u;
- password_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
- GetArena());
+ password_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(value), GetArena());
// @@protoc_insertion_point(field_set_char:DataExporter_ns.Request.password)
}
inline void Request::set_password(const char* value,
size_t size) {
_has_bits_[0] |= 0x00000002u;
- password_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+ password_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
reinterpret_cast<const char*>(value), size), GetArena());
// @@protoc_insertion_point(field_set_pointer:DataExporter_ns.Request.password)
}
inline std::string* Request::_internal_mutable_password() {
_has_bits_[0] |= 0x00000002u;
- return password_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ return password_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
}
inline std::string* Request::release_password() {
// @@protoc_insertion_point(field_release:DataExporter_ns.Request.password)
@@ -548,25 +480,6 @@ inline void Request::set_allocated_password(std::string* password) {
GetArena());
// @@protoc_insertion_point(field_set_allocated:DataExporter_ns.Request.password)
}
-inline std::string* Request::unsafe_arena_release_password() {
- // @@protoc_insertion_point(field_unsafe_arena_release:DataExporter_ns.Request.password)
- GOOGLE_DCHECK(GetArena() != nullptr);
- _has_bits_[0] &= ~0x00000002u;
- return password_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- GetArena());
-}
-inline void Request::unsafe_arena_set_allocated_password(
- std::string* password) {
- GOOGLE_DCHECK(GetArena() != nullptr);
- if (password != nullptr) {
- _has_bits_[0] |= 0x00000002u;
- } else {
- _has_bits_[0] &= ~0x00000002u;
- }
- password_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- password, GetArena());
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DataExporter_ns.Request.password)
-}
// required string schema = 3;
inline bool Request::_internal_has_schema() const {
@@ -577,7 +490,7 @@ inline bool Request::has_schema() const {
return _internal_has_schema();
}
inline void Request::clear_schema() {
- schema_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ schema_.ClearToEmpty();
_has_bits_[0] &= ~0x00000004u;
}
inline const std::string& Request::schema() const {
@@ -597,31 +510,30 @@ inline const std::string& Request::_internal_schema() const {
}
inline void Request::_internal_set_schema(const std::string& value) {
_has_bits_[0] |= 0x00000004u;
- schema_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+ schema_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
}
inline void Request::set_schema(std::string&& value) {
_has_bits_[0] |= 0x00000004u;
schema_.Set(
- &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+ ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
// @@protoc_insertion_point(field_set_rvalue:DataExporter_ns.Request.schema)
}
inline void Request::set_schema(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_has_bits_[0] |= 0x00000004u;
- schema_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
- GetArena());
+ schema_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(value), GetArena());
// @@protoc_insertion_point(field_set_char:DataExporter_ns.Request.schema)
}
inline void Request::set_schema(const char* value,
size_t size) {
_has_bits_[0] |= 0x00000004u;
- schema_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+ schema_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
reinterpret_cast<const char*>(value), size), GetArena());
// @@protoc_insertion_point(field_set_pointer:DataExporter_ns.Request.schema)
}
inline std::string* Request::_internal_mutable_schema() {
_has_bits_[0] |= 0x00000004u;
- return schema_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ return schema_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
}
inline std::string* Request::release_schema() {
// @@protoc_insertion_point(field_release:DataExporter_ns.Request.schema)
@@ -641,25 +553,6 @@ inline void Request::set_allocated_schema(std::string* schema) {
GetArena());
// @@protoc_insertion_point(field_set_allocated:DataExporter_ns.Request.schema)
}
-inline std::string* Request::unsafe_arena_release_schema() {
- // @@protoc_insertion_point(field_unsafe_arena_release:DataExporter_ns.Request.schema)
- GOOGLE_DCHECK(GetArena() != nullptr);
- _has_bits_[0] &= ~0x00000004u;
- return schema_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- GetArena());
-}
-inline void Request::unsafe_arena_set_allocated_schema(
- std::string* schema) {
- GOOGLE_DCHECK(GetArena() != nullptr);
- if (schema != nullptr) {
- _has_bits_[0] |= 0x00000004u;
- } else {
- _has_bits_[0] &= ~0x00000004u;
- }
- schema_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- schema, GetArena());
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DataExporter_ns.Request.schema)
-}
// required string table = 4;
inline bool Request::_internal_has_table() const {
@@ -670,7 +563,7 @@ inline bool Request::has_table() const {
return _internal_has_table();
}
inline void Request::clear_table() {
- table_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ table_.ClearToEmpty();
_has_bits_[0] &= ~0x00000008u;
}
inline const std::string& Request::table() const {
@@ -690,31 +583,30 @@ inline const std::string& Request::_internal_table() const {
}
inline void Request::_internal_set_table(const std::string& value) {
_has_bits_[0] |= 0x00000008u;
- table_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+ table_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
}
inline void Request::set_table(std::string&& value) {
_has_bits_[0] |= 0x00000008u;
table_.Set(
- &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+ ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
// @@protoc_insertion_point(field_set_rvalue:DataExporter_ns.Request.table)
}
inline void Request::set_table(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_has_bits_[0] |= 0x00000008u;
- table_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
- GetArena());
+ table_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(value), GetArena());
// @@protoc_insertion_point(field_set_char:DataExporter_ns.Request.table)
}
inline void Request::set_table(const char* value,
size_t size) {
_has_bits_[0] |= 0x00000008u;
- table_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+ table_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
reinterpret_cast<const char*>(value), size), GetArena());
// @@protoc_insertion_point(field_set_pointer:DataExporter_ns.Request.table)
}
inline std::string* Request::_internal_mutable_table() {
_has_bits_[0] |= 0x00000008u;
- return table_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ return table_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
}
inline std::string* Request::release_table() {
// @@protoc_insertion_point(field_release:DataExporter_ns.Request.table)
@@ -734,25 +626,6 @@ inline void Request::set_allocated_table(std::string* table) {
GetArena());
// @@protoc_insertion_point(field_set_allocated:DataExporter_ns.Request.table)
}
-inline std::string* Request::unsafe_arena_release_table() {
- // @@protoc_insertion_point(field_unsafe_arena_release:DataExporter_ns.Request.table)
- GOOGLE_DCHECK(GetArena() != nullptr);
- _has_bits_[0] &= ~0x00000008u;
- return table_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- GetArena());
-}
-inline void Request::unsafe_arena_set_allocated_table(
- std::string* table) {
- GOOGLE_DCHECK(GetArena() != nullptr);
- if (table != nullptr) {
- _has_bits_[0] |= 0x00000008u;
- } else {
- _has_bits_[0] &= ~0x00000008u;
- }
- table_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- table, GetArena());
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DataExporter_ns.Request.table)
-}
// required int32 file_version = 5;
inline bool Request::_internal_has_file_version() const {
@@ -791,7 +664,7 @@ inline bool Request::has_file_name() const {
return _internal_has_file_name();
}
inline void Request::clear_file_name() {
- file_name_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ file_name_.ClearToEmpty();
_has_bits_[0] &= ~0x00000010u;
}
inline const std::string& Request::file_name() const {
@@ -811,31 +684,30 @@ inline const std::string& Request::_internal_file_name() const {
}
inline void Request::_internal_set_file_name(const std::string& value) {
_has_bits_[0] |= 0x00000010u;
- file_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+ file_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
}
inline void Request::set_file_name(std::string&& value) {
_has_bits_[0] |= 0x00000010u;
file_name_.Set(
- &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+ ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
// @@protoc_insertion_point(field_set_rvalue:DataExporter_ns.Request.file_name)
}
inline void Request::set_file_name(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_has_bits_[0] |= 0x00000010u;
- file_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
- GetArena());
+ file_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(value), GetArena());
// @@protoc_insertion_point(field_set_char:DataExporter_ns.Request.file_name)
}
inline void Request::set_file_name(const char* value,
size_t size) {
_has_bits_[0] |= 0x00000010u;
- file_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+ file_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
reinterpret_cast<const char*>(value), size), GetArena());
// @@protoc_insertion_point(field_set_pointer:DataExporter_ns.Request.file_name)
}
inline std::string* Request::_internal_mutable_file_name() {
_has_bits_[0] |= 0x00000010u;
- return file_name_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ return file_name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
}
inline std::string* Request::release_file_name() {
// @@protoc_insertion_point(field_release:DataExporter_ns.Request.file_name)
@@ -855,25 +727,6 @@ inline void Request::set_allocated_file_name(std::string* file_name) {
GetArena());
// @@protoc_insertion_point(field_set_allocated:DataExporter_ns.Request.file_name)
}
-inline std::string* Request::unsafe_arena_release_file_name() {
- // @@protoc_insertion_point(field_unsafe_arena_release:DataExporter_ns.Request.file_name)
- GOOGLE_DCHECK(GetArena() != nullptr);
- _has_bits_[0] &= ~0x00000010u;
- return file_name_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- GetArena());
-}
-inline void Request::unsafe_arena_set_allocated_file_name(
- std::string* file_name) {
- GOOGLE_DCHECK(GetArena() != nullptr);
- if (file_name != nullptr) {
- _has_bits_[0] |= 0x00000010u;
- } else {
- _has_bits_[0] &= ~0x00000010u;
- }
- file_name_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- file_name, GetArena());
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DataExporter_ns.Request.file_name)
-}
#ifdef __GNUC__
#pragma GCC diagnostic pop
diff --git a/src/Response.pb.cc b/src/Response.pb.cc
index 41a43fda54a63b748686e91ee637479ee851ebac..e0d816e00eb6ecc1916ed4463e8b12a11ff270b1 100644
--- a/src/Response.pb.cc
+++ b/src/Response.pb.cc
@@ -28,7 +28,6 @@ static void InitDefaultsscc_info_Response_Response_2eproto() {
new (ptr) ::DataExporter_ns::Response();
::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);
}
- ::DataExporter_ns::Response::InitAsDefaultInstance();
}
::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Response_Response_2eproto =
@@ -126,8 +125,6 @@ constexpr int Response::State_ARRAYSIZE;
// ===================================================================
-void Response::InitAsDefaultInstance() {
-}
class Response::_Internal {
public:
using HasBits = decltype(std::declval<Response>()._has_bits_);
@@ -166,17 +163,17 @@ Response::Response(const Response& from)
_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
status_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (from._internal_has_status()) {
- status_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_status(),
+ status_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_status(),
GetArena());
}
file_path_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (from._internal_has_file_path()) {
- file_path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_file_path(),
+ file_path_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_file_path(),
GetArena());
}
file_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
if (from._internal_has_file_name()) {
- file_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_file_name(),
+ file_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_file_name(),
GetArena());
}
::memcpy(&state_, &from.state_,
@@ -190,8 +187,9 @@ void Response::SharedCtor() {
status_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
file_path_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
file_name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
- ::memset(&state_, 0, static_cast<size_t>(
- reinterpret_cast<char*>(&file_size_) -
+ ::memset(reinterpret_cast<char*>(this) + static_cast<size_t>(
+ reinterpret_cast<char*>(&state_) - reinterpret_cast<char*>(this)),
+ 0, static_cast<size_t>(reinterpret_cast<char*>(&file_size_) -
reinterpret_cast<char*>(&state_)) + sizeof(file_size_));
}
@@ -253,7 +251,6 @@ void Response::Clear() {
const char* Response::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
_Internal::HasBits has_bits{};
- ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
while (!ctx->Done(&ptr)) {
::PROTOBUF_NAMESPACE_ID::uint32 tag;
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
diff --git a/src/Response.pb.h b/src/Response.pb.h
index 5c2674d8ca198cd684add388059763703ccdccd4..8ff609a772a90826e2d583ca35826d3174a8171a 100644
--- a/src/Response.pb.h
+++ b/src/Response.pb.h
@@ -8,12 +8,12 @@
#include <string>
#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3012000
+#if PROTOBUF_VERSION < 3014000
#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 3012004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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.
@@ -25,7 +25,6 @@
#include <google/protobuf/arenastring.h>
#include <google/protobuf/generated_message_table_driven.h>
#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/inlined_string_field.h>
#include <google/protobuf/metadata_lite.h>
#include <google/protobuf/generated_message_reflection.h>
#include <google/protobuf/message.h>
@@ -46,7 +45,7 @@ PROTOBUF_NAMESPACE_CLOSE
struct TableStruct_Response_2eproto {
static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
- static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[]
+ static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1]
PROTOBUF_SECTION_VARIABLE(protodesc_cold);
@@ -89,7 +88,7 @@ inline const std::string& Response_State_Name(T enum_t_value) {
Response_State_descriptor(), enum_t_value);
}
inline bool Response_State_Parse(
- const std::string& name, Response_State* value) {
+ ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Response_State* value) {
return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<Response_State>(
Response_State_descriptor(), name, value);
}
@@ -98,7 +97,7 @@ inline bool Response_State_Parse(
class Response PROTOBUF_FINAL :
public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:DataExporter_ns.Response) */ {
public:
- inline Response() : Response(nullptr) {};
+ inline Response() : Response(nullptr) {}
virtual ~Response();
Response(const Response& from);
@@ -138,7 +137,6 @@ class Response PROTOBUF_FINAL :
}
static const Response& default_instance();
- static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY
static inline const Response* internal_default_instance() {
return reinterpret_cast<const Response*>(
&_Response_default_instance_);
@@ -247,7 +245,7 @@ class Response PROTOBUF_FINAL :
"Incorrect type passed to function State_Name.");
return Response_State_Name(enum_t_value);
}
- static inline bool State_Parse(const std::string& name,
+ static inline bool State_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
State* value) {
return Response_State_Parse(name, value);
}
@@ -276,15 +274,6 @@ class Response PROTOBUF_FINAL :
std::string* mutable_status();
std::string* release_status();
void set_allocated_status(std::string* status);
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- std::string* unsafe_arena_release_status();
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- void unsafe_arena_set_allocated_status(
- std::string* status);
private:
const std::string& _internal_status() const;
void _internal_set_status(const std::string& value);
@@ -305,15 +294,6 @@ class Response PROTOBUF_FINAL :
std::string* mutable_file_path();
std::string* release_file_path();
void set_allocated_file_path(std::string* file_path);
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- std::string* unsafe_arena_release_file_path();
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- void unsafe_arena_set_allocated_file_path(
- std::string* file_path);
private:
const std::string& _internal_file_path() const;
void _internal_set_file_path(const std::string& value);
@@ -334,15 +314,6 @@ class Response PROTOBUF_FINAL :
std::string* mutable_file_name();
std::string* release_file_name();
void set_allocated_file_name(std::string* file_name);
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- std::string* unsafe_arena_release_file_name();
- GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
- " string fields are deprecated and will be removed in a"
- " future release.")
- void unsafe_arena_set_allocated_file_name(
- std::string* file_name);
private:
const std::string& _internal_file_name() const;
void _internal_set_file_name(const std::string& value);
@@ -457,7 +428,7 @@ inline bool Response::has_status() const {
return _internal_has_status();
}
inline void Response::clear_status() {
- status_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ status_.ClearToEmpty();
_has_bits_[0] &= ~0x00000001u;
}
inline const std::string& Response::status() const {
@@ -477,31 +448,30 @@ inline const std::string& Response::_internal_status() const {
}
inline void Response::_internal_set_status(const std::string& value) {
_has_bits_[0] |= 0x00000001u;
- status_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+ status_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
}
inline void Response::set_status(std::string&& value) {
_has_bits_[0] |= 0x00000001u;
status_.Set(
- &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+ ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
// @@protoc_insertion_point(field_set_rvalue:DataExporter_ns.Response.status)
}
inline void Response::set_status(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_has_bits_[0] |= 0x00000001u;
- status_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
- GetArena());
+ status_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(value), GetArena());
// @@protoc_insertion_point(field_set_char:DataExporter_ns.Response.status)
}
inline void Response::set_status(const char* value,
size_t size) {
_has_bits_[0] |= 0x00000001u;
- status_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+ status_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
reinterpret_cast<const char*>(value), size), GetArena());
// @@protoc_insertion_point(field_set_pointer:DataExporter_ns.Response.status)
}
inline std::string* Response::_internal_mutable_status() {
_has_bits_[0] |= 0x00000001u;
- return status_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ return status_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
}
inline std::string* Response::release_status() {
// @@protoc_insertion_point(field_release:DataExporter_ns.Response.status)
@@ -521,25 +491,6 @@ inline void Response::set_allocated_status(std::string* status) {
GetArena());
// @@protoc_insertion_point(field_set_allocated:DataExporter_ns.Response.status)
}
-inline std::string* Response::unsafe_arena_release_status() {
- // @@protoc_insertion_point(field_unsafe_arena_release:DataExporter_ns.Response.status)
- GOOGLE_DCHECK(GetArena() != nullptr);
- _has_bits_[0] &= ~0x00000001u;
- return status_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- GetArena());
-}
-inline void Response::unsafe_arena_set_allocated_status(
- std::string* status) {
- GOOGLE_DCHECK(GetArena() != nullptr);
- if (status != nullptr) {
- _has_bits_[0] |= 0x00000001u;
- } else {
- _has_bits_[0] &= ~0x00000001u;
- }
- status_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- status, GetArena());
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DataExporter_ns.Response.status)
-}
// optional string file_path = 3;
inline bool Response::_internal_has_file_path() const {
@@ -550,7 +501,7 @@ inline bool Response::has_file_path() const {
return _internal_has_file_path();
}
inline void Response::clear_file_path() {
- file_path_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ file_path_.ClearToEmpty();
_has_bits_[0] &= ~0x00000002u;
}
inline const std::string& Response::file_path() const {
@@ -570,31 +521,30 @@ inline const std::string& Response::_internal_file_path() const {
}
inline void Response::_internal_set_file_path(const std::string& value) {
_has_bits_[0] |= 0x00000002u;
- file_path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+ file_path_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
}
inline void Response::set_file_path(std::string&& value) {
_has_bits_[0] |= 0x00000002u;
file_path_.Set(
- &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+ ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
// @@protoc_insertion_point(field_set_rvalue:DataExporter_ns.Response.file_path)
}
inline void Response::set_file_path(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_has_bits_[0] |= 0x00000002u;
- file_path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
- GetArena());
+ file_path_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(value), GetArena());
// @@protoc_insertion_point(field_set_char:DataExporter_ns.Response.file_path)
}
inline void Response::set_file_path(const char* value,
size_t size) {
_has_bits_[0] |= 0x00000002u;
- file_path_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+ file_path_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
reinterpret_cast<const char*>(value), size), GetArena());
// @@protoc_insertion_point(field_set_pointer:DataExporter_ns.Response.file_path)
}
inline std::string* Response::_internal_mutable_file_path() {
_has_bits_[0] |= 0x00000002u;
- return file_path_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ return file_path_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
}
inline std::string* Response::release_file_path() {
// @@protoc_insertion_point(field_release:DataExporter_ns.Response.file_path)
@@ -614,25 +564,6 @@ inline void Response::set_allocated_file_path(std::string* file_path) {
GetArena());
// @@protoc_insertion_point(field_set_allocated:DataExporter_ns.Response.file_path)
}
-inline std::string* Response::unsafe_arena_release_file_path() {
- // @@protoc_insertion_point(field_unsafe_arena_release:DataExporter_ns.Response.file_path)
- GOOGLE_DCHECK(GetArena() != nullptr);
- _has_bits_[0] &= ~0x00000002u;
- return file_path_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- GetArena());
-}
-inline void Response::unsafe_arena_set_allocated_file_path(
- std::string* file_path) {
- GOOGLE_DCHECK(GetArena() != nullptr);
- if (file_path != nullptr) {
- _has_bits_[0] |= 0x00000002u;
- } else {
- _has_bits_[0] &= ~0x00000002u;
- }
- file_path_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- file_path, GetArena());
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DataExporter_ns.Response.file_path)
-}
// optional int32 file_version = 4;
inline bool Response::_internal_has_file_version() const {
@@ -671,7 +602,7 @@ inline bool Response::has_file_name() const {
return _internal_has_file_name();
}
inline void Response::clear_file_name() {
- file_name_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ file_name_.ClearToEmpty();
_has_bits_[0] &= ~0x00000004u;
}
inline const std::string& Response::file_name() const {
@@ -691,31 +622,30 @@ inline const std::string& Response::_internal_file_name() const {
}
inline void Response::_internal_set_file_name(const std::string& value) {
_has_bits_[0] |= 0x00000004u;
- file_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+ file_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
}
inline void Response::set_file_name(std::string&& value) {
_has_bits_[0] |= 0x00000004u;
file_name_.Set(
- &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+ ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
// @@protoc_insertion_point(field_set_rvalue:DataExporter_ns.Response.file_name)
}
inline void Response::set_file_name(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_has_bits_[0] |= 0x00000004u;
- file_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
- GetArena());
+ file_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(value), GetArena());
// @@protoc_insertion_point(field_set_char:DataExporter_ns.Response.file_name)
}
inline void Response::set_file_name(const char* value,
size_t size) {
_has_bits_[0] |= 0x00000004u;
- file_name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+ file_name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
reinterpret_cast<const char*>(value), size), GetArena());
// @@protoc_insertion_point(field_set_pointer:DataExporter_ns.Response.file_name)
}
inline std::string* Response::_internal_mutable_file_name() {
_has_bits_[0] |= 0x00000004u;
- return file_name_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+ return file_name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
}
inline std::string* Response::release_file_name() {
// @@protoc_insertion_point(field_release:DataExporter_ns.Response.file_name)
@@ -735,25 +665,6 @@ inline void Response::set_allocated_file_name(std::string* file_name) {
GetArena());
// @@protoc_insertion_point(field_set_allocated:DataExporter_ns.Response.file_name)
}
-inline std::string* Response::unsafe_arena_release_file_name() {
- // @@protoc_insertion_point(field_unsafe_arena_release:DataExporter_ns.Response.file_name)
- GOOGLE_DCHECK(GetArena() != nullptr);
- _has_bits_[0] &= ~0x00000004u;
- return file_name_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- GetArena());
-}
-inline void Response::unsafe_arena_set_allocated_file_name(
- std::string* file_name) {
- GOOGLE_DCHECK(GetArena() != nullptr);
- if (file_name != nullptr) {
- _has_bits_[0] |= 0x00000004u;
- } else {
- _has_bits_[0] &= ~0x00000004u;
- }
- file_name_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
- file_name, GetArena());
- // @@protoc_insertion_point(field_unsafe_arena_set_allocated:DataExporter_ns.Response.file_name)
-}
// optional uint64 file_size = 6;
inline bool Response::_internal_has_file_size() const {