diff options
| author | innokentii <[email protected]> | 2024-02-16 20:10:55 +0300 |
|---|---|---|
| committer | innokentii <[email protected]> | 2024-02-16 20:25:26 +0300 |
| commit | 3ce9cf4c333518fc721cc89f404c835ba63411d8 (patch) | |
| tree | 4e48459e2137197712dea748393473287e70ec26 /contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_helpers.h | |
| parent | ce3d6ca3ea728ae0ddc30aba2e1ee88a6f79985a (diff) | |
Make PROTOC_TRANSITIVE_HEADERS=no compatible with GRPC()
add new deps to protobuf out
done with grpc
done with pb
fix
add patch to make intransitive pb compatible with grpc
60ab6319b92d29a98a74971c6906cd8eea1aab1e
Diffstat (limited to 'contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_helpers.h')
| -rw-r--r-- | contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_helpers.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_helpers.h b/contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_helpers.h index 12c8cdbde13..ceb9a54f389 100644 --- a/contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_helpers.h +++ b/contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_helpers.h @@ -478,11 +478,12 @@ bool IsAnyMessage(const Descriptor* descriptor, const Options& options); bool IsWellKnownMessage(const FileDescriptor* descriptor); inline TProtoStringType IncludeGuard(const FileDescriptor* file, bool pb_h, + bool deps, const Options& options) { // If we are generating a .pb.h file and the proto_h option is enabled, then // the .pb.h gets an extra suffix. TProtoStringType filename_identifier = FilenameIdentifier( - file->name() + (pb_h && options.proto_h ? ".pb.h" : "")); + file->name() + (deps ? ".deps": "") + (pb_h && options.proto_h ? ".pb.h" : "")); if (IsWellKnownMessage(file)) { // For well-known messages we need third_party/protobuf and net/proto2 to |