diff options
author | nechda <[email protected]> | 2024-08-29 23:50:27 +0300 |
---|---|---|
committer | nechda <[email protected]> | 2024-08-30 00:05:25 +0300 |
commit | e10d6638f07a82edae3ea8197b9f5c0affcc07ea (patch) | |
tree | 571c38cec05813766a1ad290c9d51ce7ace52919 /contrib/libs/protoc/src/google/protobuf/compiler/code_generator.h | |
parent | e79b38f2bbbf78d295d1901d2a79f898022d5224 (diff) |
Update cpp-protobuf to 22.5
Привет!\
Этот PR переключат cpp & python библиотеки protobuf на версию 22.5
Если у вас возникли проблемы после влития этого PR:
1. Если начали падать канон тесты, то проведите их переканонизацию
2. Прочитайте <https://wiki.yandex-team.ru/users/nechda/obnovlenie-cpp-protobuf-22.5/> страничку с основными изменениями
3. Если страничка в вики не помогла, то пишите в [DEVTOOLSSUPPORT](https://st.yandex-team.ru/DEVTOOLSSUPPORT)
7fecade616c20a841b9e9af7b7998bdfc8d2807d
Diffstat (limited to 'contrib/libs/protoc/src/google/protobuf/compiler/code_generator.h')
-rw-r--r-- | contrib/libs/protoc/src/google/protobuf/compiler/code_generator.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/contrib/libs/protoc/src/google/protobuf/compiler/code_generator.h b/contrib/libs/protoc/src/google/protobuf/compiler/code_generator.h index 2bbd80d650f..f0b5650a792 100644 --- a/contrib/libs/protoc/src/google/protobuf/compiler/code_generator.h +++ b/contrib/libs/protoc/src/google/protobuf/compiler/code_generator.h @@ -41,10 +41,12 @@ #include <string> #include <utility> #include <vector> -#include <google/protobuf/stubs/common.h> + +#include "y_absl/strings/string_view.h" +#include "google/protobuf/port.h" // Must be included last. -#include <google/protobuf/port_def.inc> +#include "google/protobuf/port_def.inc" namespace google { namespace protobuf { @@ -69,7 +71,9 @@ class GeneratorContext; // be registered with CommandLineInterface to support various languages. class PROTOC_EXPORT CodeGenerator { public: - inline CodeGenerator() {} + CodeGenerator() {} + CodeGenerator(const CodeGenerator&) = delete; + CodeGenerator& operator=(const CodeGenerator&) = delete; virtual ~CodeGenerator(); // Generates code for the given proto file, generating one or more files in @@ -120,9 +124,6 @@ class PROTOC_EXPORT CodeGenerator { // version of the library. When protobufs does a api breaking change, the // method can be removed. virtual bool HasGenerateAll() const { return true; } - - private: - GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CodeGenerator); }; // CodeGenerators generate one or more files in a given directory. This @@ -131,8 +132,10 @@ class PROTOC_EXPORT CodeGenerator { // runs. class PROTOC_EXPORT GeneratorContext { public: - inline GeneratorContext() { + GeneratorContext() { } + GeneratorContext(const GeneratorContext&) = delete; + GeneratorContext& operator=(const GeneratorContext&) = delete; virtual ~GeneratorContext(); // Opens the given file, truncating it if it exists, and returns a @@ -177,9 +180,6 @@ class PROTOC_EXPORT GeneratorContext { // this GeneratorContext. virtual void GetCompilerVersion(Version* version) const; - - private: - GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(GeneratorContext); }; // The type GeneratorContext was once called OutputDirectory. This typedef @@ -193,15 +193,15 @@ typedef GeneratorContext OutputDirectory; // parses to the pairs: // ("foo", "bar"), ("baz", ""), ("moo", "corge") PROTOC_EXPORT void ParseGeneratorParameter( - const TProtoStringType&, std::vector<std::pair<TProtoStringType, TProtoStringType> >*); + y_absl::string_view, std::vector<std::pair<TProtoStringType, TProtoStringType> >*); // Strips ".proto" or ".protodevel" from the end of a filename. -PROTOC_EXPORT TProtoStringType StripProto(const TProtoStringType& filename); +PROTOC_EXPORT TProtoStringType StripProto(y_absl::string_view filename); } // namespace compiler } // namespace protobuf } // namespace google -#include <google/protobuf/port_undef.inc> +#include "google/protobuf/port_undef.inc" #endif // GOOGLE_PROTOBUF_COMPILER_CODE_GENERATOR_H__ |