protoc-resolve-string-method-ambiguity.patch 1.5 KB

1234567891011121314151617181920212223242526
  1. commit 3bc481cb6e0013371bdc01ae0aef7d85dc9abe1a (HEAD)
  2. author: vadim-xd
  3. date: 2024-10-28T13:19:23+03:00
  4. Resolve ambiguity for repeated string methods
  5. --- a/src/google/protobuf/compiler/cpp/field_generators/string_field.cc (192810303a994f7cbd6bf596a3d56393bfefee6c)
  6. +++ b/src/google/protobuf/compiler/cpp/field_generators/string_field.cc (3bc481cb6e0013371bdc01ae0aef7d85dc9abe1a)
  7. @@ -782,12 +782,18 @@ void RepeatedString::GenerateAccessorDeclarations(io::Printer* p) const {
  8. $DEPRECATED$ void $set_name$(int index, const char* value);
  9. $DEPRECATED$ void $set_name$(int index, const $byte$* value, std::size_t size);
  10. $DEPRECATED$ void $set_name$(int index, absl::string_view value);
  11. + $DEPRECATED$ void $set_name$(int index, std::string&& value) {
  12. + return $set_name$(index, TProtoStringType(std::move(value)));
  13. + }
  14. $DEPRECATED$ TProtoStringType* $add_name$();
  15. $DEPRECATED$ void $add_name$(const TProtoStringType& value);
  16. $DEPRECATED$ void $add_name$(TProtoStringType&& value);
  17. $DEPRECATED$ void $add_name$(const char* value);
  18. $DEPRECATED$ void $add_name$(const $byte$* value, std::size_t size);
  19. $DEPRECATED$ void $add_name$(absl::string_view value);
  20. + $DEPRECATED$ void $add_name$(std::string&& value) {
  21. + return $add_name$(TProtoStringType(std::move(value)));
  22. + }
  23. $DEPRECATED$ const $pb$::RepeatedPtrField<TProtoStringType>& $name$() const;
  24. $DEPRECATED$ $pb$::RepeatedPtrField<TProtoStringType>* $mutable_name$();