organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #2236 from hochhaus/master

Browse source 
Silence compile warnings in bazel
This commit is contained in:
Feng Xiao 2016-10-09 08:47:59 -07:00 • committed by GitHub
commit 337a028bb6
3 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BUILD
View file

@ -14,7 +14,7 @@ COPTS = [
"-Wwrite-strings", "-Wwrite-strings",
"-Woverloaded-virtual", "-Woverloaded-virtual",
"-Wno-sign-compare", "-Wno-sign-compare",
"-Wno-error=unused-function", "-Wno-unused-function",
] ]
config_setting( config_setting(

2
src/google/protobuf/compiler/cpp/cpp_message.cc
View file

@ -3804,7 +3804,7 @@ GenerateIsInitialized(io::Printer* printer) {
if (descriptor_->extension_range_count() > 0) { if (descriptor_->extension_range_count() > 0) {
printer->Print( printer->Print(
"\n" "\n"
"if (!_extensions_.IsInitialized()) return false;"); "if (!_extensions_.IsInitialized()) return false;\n");
} }
printer->Outdent(); printer->Outdent();

24
src/google/protobuf/descriptor.pb.cc
View file

@ -8937,7 +8937,8 @@ bool FileOptions::IsInitialized() const {
if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
if (!_extensions_.IsInitialized()) return false; return true; if (!_extensions_.IsInitialized()) return false;
return true;
} }
void FileOptions::Swap(FileOptions* other) { void FileOptions::Swap(FileOptions* other) {
@ -9902,7 +9903,8 @@ bool MessageOptions::IsInitialized() const {
if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
if (!_extensions_.IsInitialized()) return false; return true; if (!_extensions_.IsInitialized()) return false;
return true;
} }
void MessageOptions::Swap(MessageOptions* other) { void MessageOptions::Swap(MessageOptions* other) {
@ -10601,7 +10603,8 @@ bool FieldOptions::IsInitialized() const {
if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
if (!_extensions_.IsInitialized()) return false; return true; if (!_extensions_.IsInitialized()) return false;
return true;
} }
void FieldOptions::Swap(FieldOptions* other) { void FieldOptions::Swap(FieldOptions* other) {
@ -11052,7 +11055,8 @@ bool OneofOptions::IsInitialized() const {
if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
if (!_extensions_.IsInitialized()) return false; return true; if (!_extensions_.IsInitialized()) return false;
return true;
} }
void OneofOptions::Swap(OneofOptions* other) { void OneofOptions::Swap(OneofOptions* other) {
@ -11446,7 +11450,8 @@ bool EnumOptions::IsInitialized() const {
if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
if (!_extensions_.IsInitialized()) return false; return true; if (!_extensions_.IsInitialized()) return false;
return true;
} }
void EnumOptions::Swap(EnumOptions* other) { void EnumOptions::Swap(EnumOptions* other) {
@ -11833,7 +11838,8 @@ bool EnumValueOptions::IsInitialized() const {
if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
if (!_extensions_.IsInitialized()) return false; return true; if (!_extensions_.IsInitialized()) return false;
return true;
} }
void EnumValueOptions::Swap(EnumValueOptions* other) { void EnumValueOptions::Swap(EnumValueOptions* other) {
@ -12195,7 +12201,8 @@ bool ServiceOptions::IsInitialized() const {
if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
if (!_extensions_.IsInitialized()) return false; return true; if (!_extensions_.IsInitialized()) return false;
return true;
} }
void ServiceOptions::Swap(ServiceOptions* other) { void ServiceOptions::Swap(ServiceOptions* other) {
@ -12557,7 +12564,8 @@ bool MethodOptions::IsInitialized() const {
if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
if (!_extensions_.IsInitialized()) return false; return true; if (!_extensions_.IsInitialized()) return false;
return true;
} }
void MethodOptions::Swap(MethodOptions* other) { void MethodOptions::Swap(MethodOptions* other) {