diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
| commit | d61aede89cf188367766b971f59cf57d7835d8e8 (patch) | |
| tree | a19842c62c3c8f51389912ecafdf932d0a572bea /src/google/protobuf/compiler/java/java_primitive_field_lite.h | |
| parent | 45d03a977193d1dcce5251e4bffe17bf0ba738ec (diff) | |
| download | protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.gz protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.bz2 protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.zip | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/compiler/java/java_primitive_field_lite.h')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_primitive_field_lite.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/java/java_primitive_field_lite.h b/src/google/protobuf/compiler/java/java_primitive_field_lite.h index c12e458c..6c05521f 100644 --- a/src/google/protobuf/compiler/java/java_primitive_field_lite.h +++ b/src/google/protobuf/compiler/java/java_primitive_field_lite.h @@ -82,11 +82,11 @@ class ImmutablePrimitiveFieldLiteGenerator void GenerateHashCode(io::Printer* printer) const; - string GetBoxedType() const; + std::string GetBoxedType() const; protected: const FieldDescriptor* descriptor_; - std::map<string, string> variables_; + std::map<std::string, std::string> variables_; const int messageBitIndex_; Context* context_; ClassNameResolver* name_resolver_; @@ -143,11 +143,11 @@ class RepeatedImmutablePrimitiveFieldLiteGenerator void GenerateHashCode(io::Printer* printer) const; - string GetBoxedType() const; + std::string GetBoxedType() const; private: const FieldDescriptor* descriptor_; - std::map<string, string> variables_; + std::map<std::string, std::string> variables_; const int messageBitIndex_; Context* context_; ClassNameResolver* name_resolver_; |