Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/src/google/protobuf/descriptor.pb.cc

Issue 164743002: Replace kEmptyString with OnceInit initialized string* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/src/google/protobuf/descriptor.pb.h ('k') | third_party/protobuf/src/google/protobuf/generated_message_reflection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/src/google/protobuf/descriptor.pb.cc
diff --git a/third_party/protobuf/src/google/protobuf/descriptor.pb.cc b/third_party/protobuf/src/google/protobuf/descriptor.pb.cc
index a05414a34477d650af77e14568086a9617b5d1cc..b8ace41bc59c35e0bdc539bbe89e59c3b7e91916 100644
--- a/third_party/protobuf/src/google/protobuf/descriptor.pb.cc
+++ b/third_party/protobuf/src/google/protobuf/descriptor.pb.cc
@@ -964,8 +964,8 @@ FileDescriptorProto::FileDescriptorProto(const FileDescriptorProto& from)
void FileDescriptorProto::SharedCtor() {
_cached_size_ = 0;
- name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- package_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
+ package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
options_ = NULL;
source_code_info_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -976,10 +976,10 @@ FileDescriptorProto::~FileDescriptorProto() {
}
void FileDescriptorProto::SharedDtor() {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
delete name_;
}
- if (package_ != &::google::protobuf::internal::kEmptyString) {
+ if (package_ != &::google::protobuf::internal::GetEmptyString()) {
delete package_;
}
if (this != default_instance_) {
@@ -1012,12 +1012,12 @@ FileDescriptorProto* FileDescriptorProto::New() const {
void FileDescriptorProto::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_name()) {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
name_->clear();
}
}
if (has_package()) {
- if (package_ != &::google::protobuf::internal::kEmptyString) {
+ if (package_ != &::google::protobuf::internal::GetEmptyString()) {
package_->clear();
}
}
@@ -1904,7 +1904,7 @@ DescriptorProto::DescriptorProto(const DescriptorProto& from)
void DescriptorProto::SharedCtor() {
_cached_size_ = 0;
- name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
options_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -1914,7 +1914,7 @@ DescriptorProto::~DescriptorProto() {
}
void DescriptorProto::SharedDtor() {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
delete name_;
}
if (this != default_instance_) {
@@ -1946,7 +1946,7 @@ DescriptorProto* DescriptorProto::New() const {
void DescriptorProto::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_name()) {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
name_->clear();
}
}
@@ -2466,13 +2466,13 @@ FieldDescriptorProto::FieldDescriptorProto(const FieldDescriptorProto& from)
void FieldDescriptorProto::SharedCtor() {
_cached_size_ = 0;
- name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
number_ = 0;
label_ = 1;
type_ = 1;
- type_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- extendee_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- default_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ type_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
+ extendee_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
+ default_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
options_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -2482,16 +2482,16 @@ FieldDescriptorProto::~FieldDescriptorProto() {
}
void FieldDescriptorProto::SharedDtor() {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
delete name_;
}
- if (type_name_ != &::google::protobuf::internal::kEmptyString) {
+ if (type_name_ != &::google::protobuf::internal::GetEmptyString()) {
delete type_name_;
}
- if (extendee_ != &::google::protobuf::internal::kEmptyString) {
+ if (extendee_ != &::google::protobuf::internal::GetEmptyString()) {
delete extendee_;
}
- if (default_value_ != &::google::protobuf::internal::kEmptyString) {
+ if (default_value_ != &::google::protobuf::internal::GetEmptyString()) {
delete default_value_;
}
if (this != default_instance_) {
@@ -2523,7 +2523,7 @@ FieldDescriptorProto* FieldDescriptorProto::New() const {
void FieldDescriptorProto::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_name()) {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
name_->clear();
}
}
@@ -2531,17 +2531,17 @@ void FieldDescriptorProto::Clear() {
label_ = 1;
type_ = 1;
if (has_type_name()) {
- if (type_name_ != &::google::protobuf::internal::kEmptyString) {
+ if (type_name_ != &::google::protobuf::internal::GetEmptyString()) {
type_name_->clear();
}
}
if (has_extendee()) {
- if (extendee_ != &::google::protobuf::internal::kEmptyString) {
+ if (extendee_ != &::google::protobuf::internal::GetEmptyString()) {
extendee_->clear();
}
}
if (has_default_value()) {
- if (default_value_ != &::google::protobuf::internal::kEmptyString) {
+ if (default_value_ != &::google::protobuf::internal::GetEmptyString()) {
default_value_->clear();
}
}
@@ -3037,7 +3037,7 @@ EnumDescriptorProto::EnumDescriptorProto(const EnumDescriptorProto& from)
void EnumDescriptorProto::SharedCtor() {
_cached_size_ = 0;
- name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
options_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -3047,7 +3047,7 @@ EnumDescriptorProto::~EnumDescriptorProto() {
}
void EnumDescriptorProto::SharedDtor() {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
delete name_;
}
if (this != default_instance_) {
@@ -3079,7 +3079,7 @@ EnumDescriptorProto* EnumDescriptorProto::New() const {
void EnumDescriptorProto::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_name()) {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
name_->clear();
}
}
@@ -3353,7 +3353,7 @@ EnumValueDescriptorProto::EnumValueDescriptorProto(const EnumValueDescriptorProt
void EnumValueDescriptorProto::SharedCtor() {
_cached_size_ = 0;
- name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
number_ = 0;
options_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -3364,7 +3364,7 @@ EnumValueDescriptorProto::~EnumValueDescriptorProto() {
}
void EnumValueDescriptorProto::SharedDtor() {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
delete name_;
}
if (this != default_instance_) {
@@ -3396,7 +3396,7 @@ EnumValueDescriptorProto* EnumValueDescriptorProto::New() const {
void EnumValueDescriptorProto::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_name()) {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
name_->clear();
}
}
@@ -3666,7 +3666,7 @@ ServiceDescriptorProto::ServiceDescriptorProto(const ServiceDescriptorProto& fro
void ServiceDescriptorProto::SharedCtor() {
_cached_size_ = 0;
- name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
options_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -3676,7 +3676,7 @@ ServiceDescriptorProto::~ServiceDescriptorProto() {
}
void ServiceDescriptorProto::SharedDtor() {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
delete name_;
}
if (this != default_instance_) {
@@ -3708,7 +3708,7 @@ ServiceDescriptorProto* ServiceDescriptorProto::New() const {
void ServiceDescriptorProto::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_name()) {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
name_->clear();
}
}
@@ -3983,9 +3983,9 @@ MethodDescriptorProto::MethodDescriptorProto(const MethodDescriptorProto& from)
void MethodDescriptorProto::SharedCtor() {
_cached_size_ = 0;
- name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- input_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- output_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
+ input_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
+ output_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
options_ = NULL;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -3995,13 +3995,13 @@ MethodDescriptorProto::~MethodDescriptorProto() {
}
void MethodDescriptorProto::SharedDtor() {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
delete name_;
}
- if (input_type_ != &::google::protobuf::internal::kEmptyString) {
+ if (input_type_ != &::google::protobuf::internal::GetEmptyString()) {
delete input_type_;
}
- if (output_type_ != &::google::protobuf::internal::kEmptyString) {
+ if (output_type_ != &::google::protobuf::internal::GetEmptyString()) {
delete output_type_;
}
if (this != default_instance_) {
@@ -4033,17 +4033,17 @@ MethodDescriptorProto* MethodDescriptorProto::New() const {
void MethodDescriptorProto::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_name()) {
- if (name_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_ != &::google::protobuf::internal::GetEmptyString()) {
name_->clear();
}
}
if (has_input_type()) {
- if (input_type_ != &::google::protobuf::internal::kEmptyString) {
+ if (input_type_ != &::google::protobuf::internal::GetEmptyString()) {
input_type_->clear();
}
}
if (has_output_type()) {
- if (output_type_ != &::google::protobuf::internal::kEmptyString) {
+ if (output_type_ != &::google::protobuf::internal::GetEmptyString()) {
output_type_->clear();
}
}
@@ -4399,13 +4399,13 @@ FileOptions::FileOptions(const FileOptions& from)
void FileOptions::SharedCtor() {
_cached_size_ = 0;
- java_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- java_outer_classname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ java_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
+ java_outer_classname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
java_multiple_files_ = false;
retain_unknown_fields_ = false;
java_generate_equals_and_hash_ = false;
optimize_for_ = 1;
- go_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ go_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
cc_generic_services_ = false;
java_generic_services_ = false;
py_generic_services_ = false;
@@ -4417,13 +4417,13 @@ FileOptions::~FileOptions() {
}
void FileOptions::SharedDtor() {
- if (java_package_ != &::google::protobuf::internal::kEmptyString) {
+ if (java_package_ != &::google::protobuf::internal::GetEmptyString()) {
delete java_package_;
}
- if (java_outer_classname_ != &::google::protobuf::internal::kEmptyString) {
+ if (java_outer_classname_ != &::google::protobuf::internal::GetEmptyString()) {
delete java_outer_classname_;
}
- if (go_package_ != &::google::protobuf::internal::kEmptyString) {
+ if (go_package_ != &::google::protobuf::internal::GetEmptyString()) {
delete go_package_;
}
if (this != default_instance_) {
@@ -4455,12 +4455,12 @@ void FileOptions::Clear() {
_extensions_.Clear();
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_java_package()) {
- if (java_package_ != &::google::protobuf::internal::kEmptyString) {
+ if (java_package_ != &::google::protobuf::internal::GetEmptyString()) {
java_package_->clear();
}
}
if (has_java_outer_classname()) {
- if (java_outer_classname_ != &::google::protobuf::internal::kEmptyString) {
+ if (java_outer_classname_ != &::google::protobuf::internal::GetEmptyString()) {
java_outer_classname_->clear();
}
}
@@ -4469,7 +4469,7 @@ void FileOptions::Clear() {
java_generate_equals_and_hash_ = false;
optimize_for_ = 1;
if (has_go_package()) {
- if (go_package_ != &::google::protobuf::internal::kEmptyString) {
+ if (go_package_ != &::google::protobuf::internal::GetEmptyString()) {
go_package_->clear();
}
}
@@ -5409,7 +5409,7 @@ void FieldOptions::SharedCtor() {
packed_ = false;
lazy_ = false;
deprecated_ = false;
- experimental_map_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ experimental_map_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
weak_ = false;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -5419,7 +5419,7 @@ FieldOptions::~FieldOptions() {
}
void FieldOptions::SharedDtor() {
- if (experimental_map_key_ != &::google::protobuf::internal::kEmptyString) {
+ if (experimental_map_key_ != &::google::protobuf::internal::GetEmptyString()) {
delete experimental_map_key_;
}
if (this != default_instance_) {
@@ -5455,7 +5455,7 @@ void FieldOptions::Clear() {
lazy_ = false;
deprecated_ = false;
if (has_experimental_map_key()) {
- if (experimental_map_key_ != &::google::protobuf::internal::kEmptyString) {
+ if (experimental_map_key_ != &::google::protobuf::internal::GetEmptyString()) {
experimental_map_key_->clear();
}
}
@@ -6828,7 +6828,7 @@ UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOp
void UninterpretedOption_NamePart::SharedCtor() {
_cached_size_ = 0;
- name_part_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ name_part_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
is_extension_ = false;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -6838,7 +6838,7 @@ UninterpretedOption_NamePart::~UninterpretedOption_NamePart() {
}
void UninterpretedOption_NamePart::SharedDtor() {
- if (name_part_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_part_ != &::google::protobuf::internal::GetEmptyString()) {
delete name_part_;
}
if (this != default_instance_) {
@@ -6869,7 +6869,7 @@ UninterpretedOption_NamePart* UninterpretedOption_NamePart::New() const {
void UninterpretedOption_NamePart::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (has_name_part()) {
- if (name_part_ != &::google::protobuf::internal::kEmptyString) {
+ if (name_part_ != &::google::protobuf::internal::GetEmptyString()) {
name_part_->clear();
}
}
@@ -7097,12 +7097,12 @@ UninterpretedOption::UninterpretedOption(const UninterpretedOption& from)
void UninterpretedOption::SharedCtor() {
_cached_size_ = 0;
- identifier_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ identifier_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
positive_int_value_ = GOOGLE_ULONGLONG(0);
negative_int_value_ = GOOGLE_LONGLONG(0);
double_value_ = 0;
- string_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- aggregate_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ string_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
+ aggregate_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -7111,13 +7111,13 @@ UninterpretedOption::~UninterpretedOption() {
}
void UninterpretedOption::SharedDtor() {
- if (identifier_value_ != &::google::protobuf::internal::kEmptyString) {
+ if (identifier_value_ != &::google::protobuf::internal::GetEmptyString()) {
delete identifier_value_;
}
- if (string_value_ != &::google::protobuf::internal::kEmptyString) {
+ if (string_value_ != &::google::protobuf::internal::GetEmptyString()) {
delete string_value_;
}
- if (aggregate_value_ != &::google::protobuf::internal::kEmptyString) {
+ if (aggregate_value_ != &::google::protobuf::internal::GetEmptyString()) {
delete aggregate_value_;
}
if (this != default_instance_) {
@@ -7148,7 +7148,7 @@ UninterpretedOption* UninterpretedOption::New() const {
void UninterpretedOption::Clear() {
if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
if (has_identifier_value()) {
- if (identifier_value_ != &::google::protobuf::internal::kEmptyString) {
+ if (identifier_value_ != &::google::protobuf::internal::GetEmptyString()) {
identifier_value_->clear();
}
}
@@ -7156,12 +7156,12 @@ void UninterpretedOption::Clear() {
negative_int_value_ = GOOGLE_LONGLONG(0);
double_value_ = 0;
if (has_string_value()) {
- if (string_value_ != &::google::protobuf::internal::kEmptyString) {
+ if (string_value_ != &::google::protobuf::internal::GetEmptyString()) {
string_value_->clear();
}
}
if (has_aggregate_value()) {
- if (aggregate_value_ != &::google::protobuf::internal::kEmptyString) {
+ if (aggregate_value_ != &::google::protobuf::internal::GetEmptyString()) {
aggregate_value_->clear();
}
}
@@ -7586,8 +7586,8 @@ SourceCodeInfo_Location::SourceCodeInfo_Location(const SourceCodeInfo_Location&
void SourceCodeInfo_Location::SharedCtor() {
_cached_size_ = 0;
- leading_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
- trailing_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+ leading_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
+ trailing_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -7596,10 +7596,10 @@ SourceCodeInfo_Location::~SourceCodeInfo_Location() {
}
void SourceCodeInfo_Location::SharedDtor() {
- if (leading_comments_ != &::google::protobuf::internal::kEmptyString) {
+ if (leading_comments_ != &::google::protobuf::internal::GetEmptyString()) {
delete leading_comments_;
}
- if (trailing_comments_ != &::google::protobuf::internal::kEmptyString) {
+ if (trailing_comments_ != &::google::protobuf::internal::GetEmptyString()) {
delete trailing_comments_;
}
if (this != default_instance_) {
@@ -7630,12 +7630,12 @@ SourceCodeInfo_Location* SourceCodeInfo_Location::New() const {
void SourceCodeInfo_Location::Clear() {
if (_has_bits_[2 / 32] & (0xffu << (2 % 32))) {
if (has_leading_comments()) {
- if (leading_comments_ != &::google::protobuf::internal::kEmptyString) {
+ if (leading_comments_ != &::google::protobuf::internal::GetEmptyString()) {
leading_comments_->clear();
}
}
if (has_trailing_comments()) {
- if (trailing_comments_ != &::google::protobuf::internal::kEmptyString) {
+ if (trailing_comments_ != &::google::protobuf::internal::GetEmptyString()) {
trailing_comments_->clear();
}
}
« no previous file with comments | « third_party/protobuf/src/google/protobuf/descriptor.pb.h ('k') | third_party/protobuf/src/google/protobuf/generated_message_reflection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698