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