Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h |
index 3264134aa3d30b5fa57322ce48e6f7ecccd8e208..616e20674f70dc7aad12e1d3e943e50c49c9b1f4 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h |
+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h |
@@ -1,6 +1,6 @@ |
// Protocol Buffers - Google's data interchange format |
// Copyright 2008 Google Inc. All rights reserved. |
-// http://code.google.com/p/protobuf/ |
+// https://developers.google.com/protocol-buffers/ |
// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
@@ -52,8 +52,10 @@ class StringFieldGenerator : public FieldGenerator { |
// implements FieldGenerator --------------------------------------- |
void GeneratePrivateMembers(io::Printer* printer) const; |
+ void GenerateStaticMembers(io::Printer* printer) const; |
void GenerateAccessorDeclarations(io::Printer* printer) const; |
- void GenerateInlineAccessorDefinitions(io::Printer* printer) const; |
+ void GenerateInlineAccessorDefinitions(io::Printer* printer, |
+ bool is_inline) const; |
void GenerateNonInlineAccessorDefinitions(io::Printer* printer) const; |
void GenerateClearingCode(io::Printer* printer) const; |
void GenerateMergingCode(io::Printer* printer) const; |
@@ -67,13 +69,34 @@ class StringFieldGenerator : public FieldGenerator { |
void GenerateSerializeWithCachedSizesToArray(io::Printer* printer) const; |
void GenerateByteSize(io::Printer* printer) const; |
- private: |
+ protected: |
const FieldDescriptor* descriptor_; |
map<string, string> variables_; |
+ private: |
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator); |
}; |
+class StringOneofFieldGenerator : public StringFieldGenerator { |
+ public: |
+ explicit StringOneofFieldGenerator(const FieldDescriptor* descriptor, |
+ const Options& options); |
+ ~StringOneofFieldGenerator(); |
+ |
+ // implements FieldGenerator --------------------------------------- |
+ void GenerateInlineAccessorDefinitions(io::Printer* printer, |
+ bool is_inline) const; |
+ void GenerateClearingCode(io::Printer* printer) const; |
+ void GenerateSwappingCode(io::Printer* printer) const; |
+ void GenerateConstructorCode(io::Printer* printer) const; |
+ void GenerateDestructorCode(io::Printer* printer) const; |
+ void GenerateMergeFromCodedStream(io::Printer* printer) const; |
+ |
+ private: |
+ const bool dependent_field_; |
+ GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringOneofFieldGenerator); |
+}; |
+ |
class RepeatedStringFieldGenerator : public FieldGenerator { |
public: |
explicit RepeatedStringFieldGenerator(const FieldDescriptor* descriptor, |
@@ -83,7 +106,8 @@ class RepeatedStringFieldGenerator : public FieldGenerator { |
// implements FieldGenerator --------------------------------------- |
void GeneratePrivateMembers(io::Printer* printer) const; |
void GenerateAccessorDeclarations(io::Printer* printer) const; |
- void GenerateInlineAccessorDefinitions(io::Printer* printer) const; |
+ void GenerateInlineAccessorDefinitions(io::Printer* printer, |
+ bool is_inline) const; |
void GenerateClearingCode(io::Printer* printer) const; |
void GenerateMergingCode(io::Printer* printer) const; |
void GenerateSwappingCode(io::Printer* printer) const; |