diff options
| author |  Julien Brianceau <jbriance@cisco.com> | 2016-11-21 09:29:22 +0100 |
|---|---|---|
| committer | Julien Brianceau <jbriance@cisco.com> | 2016-11-21 09:38:34 +0100 |
| commit | a5c30ce6239822a02d34f2b2f24eb0ce4157ff3a (patch) | |
| tree | 88051da5c8c4cb269ce5068e263d3b1a57bf34e1 /src/google/protobuf/compiler/cpp | |
| parent | cd315dcbadc02569e145bde16e3f66c2fbb08e31 (diff) | |
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.
Diffstat (limited to 'src/google/protobuf/compiler/cpp')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_file.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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. |