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

Merge pull request #2398 from jbrianceau/no-static-init-define-fix

Browse source 
C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
This commit is contained in:
Feng Xiao 2016-11-21 12:05:58 -08:00 • committed by GitHub
commit b7632464b4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -722,7 +722,7 @@ void FileGenerator::GenerateBuildDescriptors(io::Printer* printer) {
"adddescriptorsname", GlobalAddDescriptorsName(file_->name()));
if (!StaticInitializersForced(file_, options_)) {
printer->Print("#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER\n");
printer->Print("#ifndef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER\n");
}
printer->Print(
// With static initializers.