Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h |
=================================================================== |
--- third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h (revision 216642) |
+++ third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h (working copy) |
@@ -36,8 +36,10 @@ |
#define GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_H__ |
#include <string> |
+#include <google/protobuf/compiler/cpp/cpp_options.h> |
#include <google/protobuf/descriptor.h> |
+ |
namespace google { |
namespace protobuf { |
namespace io { |
@@ -53,7 +55,7 @@ |
public: |
// See generator.cc for the meaning of dllexport_decl. |
explicit EnumGenerator(const EnumDescriptor* descriptor, |
- const string& dllexport_decl); |
+ const Options& options); |
~EnumGenerator(); |
// Header stuff. |
@@ -86,7 +88,7 @@ |
private: |
const EnumDescriptor* descriptor_; |
string classname_; |
- string dllexport_decl_; |
+ Options options_; |
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator); |
}; |