fixup.patch 2.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. --- a/src/compiler/csharp_generator.cc (index)
  2. +++ b/src/compiler/csharp_generator.cc (working tree)
  3. @@ -429,7 +429,7 @@ void GenerateServiceDescriptorProperty(Printer* out,
  4. out->Print(" get { return $umbrella$.Descriptor.Services[$index$]; }\n",
  5. "umbrella",
  6. GRPC_CUSTOM_CSHARP_GETREFLECTIONCLASSNAME(service->file()),
  7. - "index", index.str());
  8. + "index", TString(index.str()));
  9. out->Print("}\n");
  10. out->Print("\n");
  11. }
  12. --- a/src/compiler/objective_c_generator.h (index)
  13. +++ b/src/compiler/objective_c_generator.h (working tree)
  14. @@ -33,26 +33,26 @@ using ::grpc::protobuf::ServiceDescriptor;
  15. using ::TString;
  16. // Returns forward declaration of classes in the generated header file.
  17. -string GetAllMessageClasses(const FileDescriptor* file);
  18. +TString GetAllMessageClasses(const FileDescriptor* file);
  19. // Returns the content to be included defining the @protocol segment at the
  20. // insertion point of the generated implementation file. This interface is
  21. // legacy and for backwards compatibility.
  22. -string GetProtocol(const ServiceDescriptor* service,
  23. +TString GetProtocol(const ServiceDescriptor* service,
  24. const Parameters& generator_params);
  25. // Returns the content to be included defining the @protocol segment at the
  26. // insertion point of the generated implementation file.
  27. -string GetV2Protocol(const ServiceDescriptor* service);
  28. +TString GetV2Protocol(const ServiceDescriptor* service);
  29. // Returns the content to be included defining the @interface segment at the
  30. // insertion point of the generated implementation file.
  31. -string GetInterface(const ServiceDescriptor* service,
  32. +TString GetInterface(const ServiceDescriptor* service,
  33. const Parameters& generator_params);
  34. // Returns the content to be included in the "global_scope" insertion point of
  35. // the generated implementation file.
  36. -string GetSource(const ServiceDescriptor* service,
  37. +TString GetSource(const ServiceDescriptor* service,
  38. const Parameters& generator_params);
  39. } // namespace grpc_objective_c_generator
  40. --- a/src/compiler/objective_c_generator_helpers.h (index)
  41. +++ b/src/compiler/objective_c_generator_helpers.h (working tree)
  42. @@ -32,1 +32,1 @@ using ::grpc::protobuf::FileDescriptor;
  43. -inline string MessageHeaderName(const FileDescriptor* file) {
  44. +inline TString MessageHeaderName(const FileDescriptor* file) {
  45. --- a/src/compiler/ruby_generator_string-inl.h (index)
  46. +++ b/src/compiler/ruby_generator_string-inl.h (working tree)
  47. @@ -34,9 +34,9 @@ namespace grpc_ruby_generator {
  48. inline std::vector<TString>& Split(const TString& s, char delim,
  49. std::vector<TString>* elems) {
  50. std::stringstream ss(s);
  51. - TString item;
  52. + std::string item;
  53. while (getline(ss, item, delim)) {
  54. - elems->push_back(item);
  55. + elems->emplace_back(item);
  56. }
  57. return *elems;
  58. }