3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-26 21:04:23 +08:00
Code Issues Projects Releases Wiki Activity

protoc-c: Remove GOOGLE_DISALLOW_EVIL_CONSTRUCTORS macro invocations

Browse Source 
protobuf has removed the definition of this macro as of commit
1595417dd3859bbff7d3d61ad0b6e39044d47489, so the invocation of this
macro in protobuf-c breaks the build when building agaist the protobuf
22.x or 23.x series.

Simply removing the macro invocations seems to be safe and doesn't break
the build on Debian's protobuf 3.21.12 nor Debian's protobuf 3.6.1.3.
This commit is contained in:
Robert Edmonds 2023-07-02 17:48:18 -04:00
parent c3f525da36
commit ad48868dfe
12 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protoc-c/c_bytes_field.h
View File

@ -87,8 +87,6 @@ class BytesFieldGenerator : public FieldGenerator {
private: private:
std::map<std::string, std::string> variables_; std::map<std::string, std::string> variables_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(BytesFieldGenerator);
}; };

2
protoc-c/c_enum.h
View File

@ -106,8 +106,6 @@ class EnumGenerator {
private: private:
const EnumDescriptor* descriptor_; const EnumDescriptor* descriptor_;
std::string dllexport_decl_; std::string dllexport_decl_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
}; };
} // namespace c } // namespace c

2
protoc-c/c_enum_field.h
View File

@ -85,8 +85,6 @@ class EnumFieldGenerator : public FieldGenerator {
private: private:
std::map<std::string, std::string> variables_; std::map<std::string, std::string> variables_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumFieldGenerator);
}; };

2
protoc-c/c_extension.h
View File

@ -98,8 +98,6 @@ class ExtensionGenerator {
const FieldDescriptor* descriptor_; const FieldDescriptor* descriptor_;
std::string type_traits_; std::string type_traits_;
std::string dllexport_decl_; std::string dllexport_decl_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator);
}; };
} // namespace c } // namespace c

5
protoc-c/c_field.h
View File

@ -103,9 +103,6 @@ class FieldGenerator {
const std::string &type_macro, const std::string &type_macro,
const std::string &descriptor_addr) const; const std::string &descriptor_addr) const;
const FieldDescriptor *descriptor_; const FieldDescriptor *descriptor_;
private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGenerator);
}; };
// Convenience class which constructs FieldGenerators for a Descriptor. // Convenience class which constructs FieldGenerators for a Descriptor.
@ -121,8 +118,6 @@ class FieldGeneratorMap {
std::unique_ptr<std::unique_ptr<FieldGenerator>[]> field_generators_; std::unique_ptr<std::unique_ptr<FieldGenerator>[]> field_generators_;
static FieldGenerator* MakeGenerator(const FieldDescriptor* field); static FieldGenerator* MakeGenerator(const FieldDescriptor* field);
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap);
}; };
} // namespace c } // namespace c

2
protoc-c/c_file.h
View File

@ -103,8 +103,6 @@ class FileGenerator {
std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_; std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_;
std::unique_ptr<std::unique_ptr<ServiceGenerator>[]> service_generators_; std::unique_ptr<std::unique_ptr<ServiceGenerator>[]> service_generators_;
std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_; std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
}; };
} // namespace c } // namespace c

3
protoc-c/c_generator.h
View File

@ -93,9 +93,6 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerator {
const std::string& parameter, const std::string& parameter,
OutputDirectory* output_directory, OutputDirectory* output_directory,
std::string* error) const; std::string* error) const;
private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CGenerator);
}; };
} // namespace c } // namespace c

2
protoc-c/c_message.h
View File

@ -136,8 +136,6 @@ class MessageGenerator {
std::unique_ptr<std::unique_ptr<MessageGenerator>[]> nested_generators_; std::unique_ptr<std::unique_ptr<MessageGenerator>[]> nested_generators_;
std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_; std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_;
std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_; std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator);
}; };
} // namespace c } // namespace c

4
protoc-c/c_message_field.h
View File

@ -82,10 +82,6 @@ class MessageFieldGenerator : public FieldGenerator {
void GenerateDescriptorInitializer(io::Printer* printer) const; void GenerateDescriptorInitializer(io::Printer* printer) const;
std::string GetDefaultValue(void) const; std::string GetDefaultValue(void) const;
void GenerateStaticInit(io::Printer* printer) const; void GenerateStaticInit(io::Printer* printer) const;
private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator);
}; };

4
protoc-c/c_primitive_field.h
View File

@ -82,10 +82,6 @@ class PrimitiveFieldGenerator : public FieldGenerator {
void GenerateDescriptorInitializer(io::Printer* printer) const; void GenerateDescriptorInitializer(io::Printer* printer) const;
std::string GetDefaultValue(void) const; std::string GetDefaultValue(void) const;
void GenerateStaticInit(io::Printer* printer) const; void GenerateStaticInit(io::Printer* printer) const;
private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PrimitiveFieldGenerator);
}; };
} // namespace c } // namespace c

2
protoc-c/c_service.h
View File

@ -100,8 +100,6 @@ class ServiceGenerator {
const ServiceDescriptor* descriptor_; const ServiceDescriptor* descriptor_;
std::map<std::string, std::string> vars_; std::map<std::string, std::string> vars_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator);
}; };
} // namespace c } // namespace c

2
protoc-c/c_string_field.h
View File

@ -87,8 +87,6 @@ class StringFieldGenerator : public FieldGenerator {
private: private:
std::map<std::string, std::string> variables_; std::map<std::string, std::string> variables_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator);
}; };