diff options
| author |  Adam Cozzette <acozzette@google.com> | 2016-11-17 16:48:38 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-11-17 16:59:59 -0800 |
| commit | 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (patch) | |
| tree | 0276f81f8848a05d84cd7e287b43d665e30f04e3 /src/google/protobuf/compiler/java/java_enum_field_lite.cc | |
| parent | e28286fa05d8327fd6c5aa70cfb3be558f0932b8 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/compiler/java/java_enum_field_lite.cc')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_enum_field_lite.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/java/java_enum_field_lite.cc b/src/google/protobuf/compiler/java/java_enum_field_lite.cc index aa0eb5e8..f1dc47fc 100644 --- a/src/google/protobuf/compiler/java/java_enum_field_lite.cc +++ b/src/google/protobuf/compiler/java/java_enum_field_lite.cc @@ -58,7 +58,7 @@ void SetEnumVariables(const FieldDescriptor* descriptor, int builderBitIndex, const FieldGeneratorInfo* info, ClassNameResolver* name_resolver, - map<string, string>* variables) { + std::map<string, string>* variables) { SetCommonFieldVariables(descriptor, info, variables); (*variables)["type"] = @@ -68,7 +68,8 @@ void SetEnumVariables(const FieldDescriptor* descriptor, (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver); (*variables)["default_number"] = SimpleItoa( descriptor->default_value_enum()->number()); - (*variables)["tag"] = SimpleItoa(internal::WireFormat::MakeTag(descriptor)); + (*variables)["tag"] = + SimpleItoa(static_cast<int32>(internal::WireFormat::MakeTag(descriptor))); (*variables)["tag_size"] = SimpleItoa( internal::WireFormat::TagSize(descriptor->number(), GetType(descriptor))); // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported |