1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
--- a/src/google/protobuf/compiler/cpp/parse_function_generator.cc (index)
+++ b/src/google/protobuf/compiler/cpp/parse_function_generator.cc (working tree)
@@ -44,6 +44,10 @@
#include "google/protobuf/generated_message_tctable_impl.h"
#include "google/protobuf/wire_format.h"
+#include "util/generic/string.h"
+
+using TProtoStringType = TString;
+
namespace google {
namespace protobuf {
namespace compiler {
@@ -894,7 +898,7 @@ void ParseFunctionGenerator::GenerateFieldNames(Formatter& format) {
// Then print each name in a line of its own
for (; sizes < sizes_end; p += *sizes++) {
- if (*sizes != 0) format("\"$1$\"\n", TProtoStringType(p, p + *sizes));
+ if (*sizes != 0) format("\"$1$\"\n", TProtoStringType((const char*)p, (const char*)p + *sizes));
}
}
--- a/src/google/protobuf/compiler/csharp/names.h (index)
+++ b/src/google/protobuf/compiler/csharp/names.h (working tree)
@@ -39,10 +39,13 @@
#define GOOGLE_PROTOBUF_COMPILER_CSHARP_NAMES_H__
#include <string>
+#include "util/generic/string.h"
#include "absl/strings/string_view.h"
#include "google/protobuf/port_def.inc"
+using TProtoStringType = TString;
+
namespace google {
namespace protobuf {
--- a/src/google/protobuf/compiler/java/options.h (index)
+++ b/src/google/protobuf/compiler/java/options.h (working tree)
@@ -32,9 +32,12 @@
#define GOOGLE_PROTOBUF_COMPILER_JAVA_OPTIONS_H__
#include <string>
+#include "util/generic/string.h"
#include "google/protobuf/port_def.inc"
+using TProtoStringType = TString;
+
namespace google {
namespace protobuf {
namespace compiler {
--- a/src/google/protobuf/compiler/objectivec/text_format_decode_data.h (index)
+++ b/src/google/protobuf/compiler/objectivec/text_format_decode_data.h (working tree)
@@ -35,9 +35,13 @@
#include <utility>
#include <vector>
+#include "util/generic/string.h"
+
// Must be included last
#include "google/protobuf/port_def.inc"
+using TProtoStringType = TString;
+
namespace google {
namespace protobuf {
namespace compiler {
|
