Don't use dll-export declspec on class-nested extensions.

pull/3335/head
kenton@google.com 16 years ago
parent 41c3760f2f
commit 30be0a8758
  1. 15
      src/google/protobuf/compiler/cpp/cpp_extension.cc

@ -89,12 +89,15 @@ void ExtensionGenerator::GenerateDeclaration(io::Printer* printer) {
vars["constant_name"] = FieldConstantName(descriptor_);
// If this is a class member, it needs to be declared "static". Otherwise,
// it needs to be "extern".
vars["qualifier"] =
(descriptor_->extension_scope() == NULL) ? "extern" : "static";
if (!dllexport_decl_.empty()) {
vars["qualifier"] = dllexport_decl_ + " " + vars["qualifier"];
// it needs to be "extern". In the latter case, it also needs the DLL
// export/import specifier.
if (descriptor_->extension_scope() == NULL) {
vars["qualifier"] = "extern";
if (!dllexport_decl_.empty()) {
vars["qualifier"] = dllexport_decl_ + " " + vars["qualifier"];
}
} else {
vars["qualifier"] = "static";
}
printer->Print(vars,

Loading…
Cancel
Save