Upgrade linux protobuf

This commit is contained in:
John Colvin committed 2021-12-12 15:56:55 -05:00
1 parent 79f2f356d5
commit 0f3130fb47
689 files changed
+141922 -132057

No files matched your search

@@ -42,18 +42,20 @@
namespace google {
namespace protobuf {
class FieldDescriptor; // descriptor.h
namespace compiler {
namespace java {
class Context; // context.h
class ClassNameResolver; // name_resolver.h
}
}
namespace io {
class Printer; // printer.h
}
class FieldDescriptor; // descriptor.h
namespace compiler {
namespace java {
class Context; // context.h
class ClassNameResolver; // name_resolver.h
} // namespace java
} // namespace compiler
namespace io {
class Printer; // printer.h
}
} // namespace protobuf
} // namespace google
namespace google {
namespace protobuf {
namespace compiler {
namespace java {
@@ -68,18 +70,19 @@ class ExtensionGenerator {
virtual void Generate(io::Printer* printer) = 0;
// Returns an estimate of the number of bytes the printed code will compile to
// Returns an estimate of the number of bytes the printed code will compile
// to
virtual int GenerateNonNestedInitializationCode(io::Printer* printer) = 0;
// Returns an estimate of the number of bytes the printed code will compile to
// Returns an estimate of the number of bytes the printed code will compile
// to
virtual int GenerateRegistrationCode(io::Printer* printer) = 0;
protected:
static void InitTemplateVars(const FieldDescriptor* descriptor,
const string& scope,
bool immutable,
ClassNameResolver* name_resolver,
std::map<string, string>* vars_pointer);
static void InitTemplateVars(
const FieldDescriptor* descriptor, const std::string& scope,
bool immutable, ClassNameResolver* name_resolver,
std::map<std::string, std::string>* vars_pointer);
private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator);
@@ -91,15 +94,14 @@ class ImmutableExtensionGenerator : public ExtensionGenerator {
Context* context);
virtual ~ImmutableExtensionGenerator();
virtual void Generate(io::Printer* printer);
virtual int GenerateNonNestedInitializationCode(io::Printer* printer);
virtual int GenerateRegistrationCode(io::Printer* printer);
void Generate(io::Printer* printer) override;
int GenerateNonNestedInitializationCode(io::Printer* printer) override;
int GenerateRegistrationCode(io::Printer* printer) override;
protected:
const FieldDescriptor* descriptor_;
Context* context_;
ClassNameResolver* name_resolver_;
string scope_;
std::string scope_;
private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableExtensionGenerator);
@@ -108,6 +110,6 @@ class ImmutableExtensionGenerator : public ExtensionGenerator {
} // namespace java
} // namespace compiler
} // namespace protobuf
} // namespace google
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_EXTENSION_H__