From a5c30ce6239822a02d34f2b2f24eb0ce4157ff3a Mon Sep 17 00:00:00 2001 From: Julien Brianceau Date: Mon, 21 Nov 2016 09:29:22 +0100 Subject: C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Behavior of define GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER has been altered between 337a028 and cc8ca5b for C++. See github issue #2385 for further details. --- src/google/protobuf/compiler/cpp/cpp_file.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/google/protobuf/compiler/cpp/cpp_file.cc index 369497ce..b8b456b7 100644 --- 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. -- cgit v1.2.3