| Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_helpers.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_helpers.h b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_helpers.h
|
| index 018acfcad0f0f78f6e396d320d83f1e447ad8566..3a0c03881ad9410c8a7155ec9c30f9c563ea7e3c 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_helpers.h
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_helpers.h
|
| @@ -147,6 +147,9 @@ string FilenameIdentifier(const string& filename);
|
| // Return the name of the AddDescriptors() function for a given file.
|
| string GlobalAddDescriptorsName(const string& filename);
|
|
|
| +// Return the name of the InitDefaults() function for a given file.
|
| +string GlobalInitDefaultsName(const string& filename);
|
| +
|
| // Return the name of the AssignDescriptors() function for a given file.
|
| string GlobalAssignDescriptorsName(const string& filename);
|
|
|
| @@ -223,22 +226,6 @@ inline bool HasFastArraySerialization(const FileDescriptor* file,
|
| bool StaticInitializersForced(const FileDescriptor* file,
|
| const Options& options);
|
|
|
| -// Prints 'with_static_init' if static initializers have to be used for the
|
| -// provided file. Otherwise emits both 'with_static_init' and
|
| -// 'without_static_init' using #ifdef.
|
| -void PrintHandlingOptionalStaticInitializers(
|
| - const FileDescriptor* file, const Options& options, io::Printer* printer,
|
| - const char* with_static_init, const char* without_static_init,
|
| - const char* var1 = NULL, const string& val1 = "", const char* var2 = NULL,
|
| - const string& val2 = "");
|
| -
|
| -void PrintHandlingOptionalStaticInitializers(const map<string, string>& vars,
|
| - const FileDescriptor* file,
|
| - const Options& options,
|
| - io::Printer* printer,
|
| - const char* with_static_init,
|
| - const char* without_static_init);
|
| -
|
|
|
| inline bool IsMapEntryMessage(const Descriptor* descriptor) {
|
| return descriptor->options().map_entry();
|
|
|