Resolved an issue where NO_DESTROY and CONSTINIT were in incorrect order

pull/8307/head
Yuhanun Citgez 4 years ago committed by Adam Cozzette
parent 0040102e6f
commit eef276412e
  1. 2
      src/google/protobuf/compiler/cpp/cpp_file.cc

@ -454,7 +454,7 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx,
// enough. However, the empty destructor fails to be elided in some
// configurations (like non-opt or with certain sanitizers). NO_DESTROY is
// there just to improve performance and binary size in these builds.
format("PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_NO_DESTROY $1$ $2$;\n",
format("PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT $1$ $2$;\n",
DefaultInstanceType(generator->descriptor_, options_),
DefaultInstanceName(generator->descriptor_, options_));

Loading…
Cancel
Save