| Index: third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.h
|
| index ee2f5f7a88c79b37a11ddaf0738c2d0200725804..b7be912cb95e5cc2d28146cc0fc9d0266a3b519c 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.h
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_lite.h
|
| @@ -58,9 +58,8 @@ namespace java {
|
|
|
| class EnumLiteGenerator {
|
| public:
|
| - explicit EnumLiteGenerator(const EnumDescriptor* descriptor,
|
| - bool immutable_api,
|
| - Context* context);
|
| + EnumLiteGenerator(const EnumDescriptor* descriptor, bool immutable_api,
|
| + Context* context);
|
| ~EnumLiteGenerator();
|
|
|
| void Generate(io::Printer* printer);
|
| @@ -73,13 +72,13 @@ class EnumLiteGenerator {
|
| // considered equivalent. We treat the first defined constant for any
|
| // given numeric value as "canonical" and the rest as aliases of that
|
| // canonical value.
|
| - vector<const EnumValueDescriptor*> canonical_values_;
|
| + std::vector<const EnumValueDescriptor*> canonical_values_;
|
|
|
| struct Alias {
|
| const EnumValueDescriptor* value;
|
| const EnumValueDescriptor* canonical_value;
|
| };
|
| - vector<Alias> aliases_;
|
| + std::vector<Alias> aliases_;
|
|
|
| bool immutable_api_;
|
|
|
|
|