| Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h
|
| index 2e85a0bd3c3aab73255e672c774cb11a2efd4031..f3aa72e4409addc31e1507826e31cf5ff8297812 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.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
|
| @@ -35,6 +35,7 @@
|
| #ifndef GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_H__
|
| #define GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_H__
|
|
|
| +#include <set>
|
| #include <string>
|
| #include <google/protobuf/compiler/cpp/cpp_options.h>
|
| #include <google/protobuf/descriptor.h>
|
| @@ -60,6 +61,12 @@ class EnumGenerator {
|
|
|
| // Header stuff.
|
|
|
| + // Fills the name to use when declaring the enum. This is for use when
|
| + // generating other .proto.h files. This code should be placed within the
|
| + // enum's package namespace, but NOT within any class, even for nested
|
| + // enums.
|
| + void FillForwardDeclaration(set<string>* enum_names);
|
| +
|
| // Generate header code defining the enum. This code should be placed
|
| // within the enum's package namespace, but NOT within any class, even for
|
| // nested enums.
|
| @@ -89,6 +96,8 @@ class EnumGenerator {
|
| const EnumDescriptor* descriptor_;
|
| string classname_;
|
| Options options_;
|
| + // whether to generate the *_ARRAYSIZE constant.
|
| + bool generate_array_size_;
|
|
|
| GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
|
| };
|
|
|