Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -44,11 +44,10 @@ namespace java {
|
||||
|
||||
ImmutableExtensionLiteGenerator::ImmutableExtensionLiteGenerator(
|
||||
const FieldDescriptor* descriptor, Context* context)
|
||||
: descriptor_(descriptor), context_(context),
|
||||
name_resolver_(context->GetNameResolver()) {
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
if (descriptor_->extension_scope() != NULL) {
|
||||
scope_ = name_resolver_->GetImmutableClassName(
|
||||
descriptor_->extension_scope());
|
||||
scope_ =
|
||||
name_resolver_->GetImmutableClassName(descriptor_->extension_scope());
|
||||
} else {
|
||||
scope_ = name_resolver_->GetImmutableClassName(descriptor_->file());
|
||||
}
|
||||
@@ -57,12 +56,11 @@ ImmutableExtensionLiteGenerator::ImmutableExtensionLiteGenerator(
|
||||
ImmutableExtensionLiteGenerator::~ImmutableExtensionLiteGenerator() {}
|
||||
|
||||
void ImmutableExtensionLiteGenerator::Generate(io::Printer* printer) {
|
||||
std::map<string, string> vars;
|
||||
std::map<std::string, std::string> vars;
|
||||
const bool kUseImmutableNames = true;
|
||||
InitTemplateVars(descriptor_, scope_, kUseImmutableNames, name_resolver_,
|
||||
&vars);
|
||||
printer->Print(vars,
|
||||
"public static final int $constant_name$ = $number$;\n");
|
||||
printer->Print(vars, "public static final int $constant_name$ = $number$;\n");
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
if (descriptor_->is_repeated()) {
|
||||
@@ -106,10 +104,8 @@ int ImmutableExtensionLiteGenerator::GenerateNonNestedInitializationCode(
|
||||
|
||||
int ImmutableExtensionLiteGenerator::GenerateRegistrationCode(
|
||||
io::Printer* printer) {
|
||||
printer->Print(
|
||||
"registry.add($scope$.$name$);\n",
|
||||
"scope", scope_,
|
||||
"name", UnderscoresToCamelCase(descriptor_));
|
||||
printer->Print("registry.add($scope$.$name$);\n", "scope", scope_, "name",
|
||||
UnderscoresToCamelCaseCheckReserved(descriptor_));
|
||||
return 7;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user