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

C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
8 years ago · b7632464b4
parent cd315dcbad a5c30ce623
commit b7632464b4
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/compiler/cpp/cpp_file.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_file.cc
@ -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.