Index: third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.h |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.h b/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.h |
index e96e7938878a82336608a36b4b4c668efdcd2237..1563ca7e1d9630e323f7bd1ae5f1da0b6c969cdb 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.h |
+++ b/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.h |
@@ -36,6 +36,7 @@ |
#define GOOGLE_PROTOBUF_COMPILER_CSHARP_HELPERS_H__ |
#include <string> |
+#include <google/protobuf/stubs/port.h> |
#include <google/protobuf/descriptor.pb.h> |
#include <google/protobuf/descriptor.h> |
#include <google/protobuf/compiler/code_generator.h> |
@@ -46,6 +47,7 @@ namespace protobuf { |
namespace compiler { |
namespace csharp { |
+struct Options; |
class FieldGeneratorBase; |
// TODO: start using this enum. |
@@ -82,7 +84,9 @@ std::string GetPropertyName(const FieldDescriptor* descriptor); |
int GetFixedSize(FieldDescriptor::Type type); |
-std::string UnderscoresToCamelCase(const std::string& input, bool cap_next_letter, bool preserve_period); |
+std::string UnderscoresToCamelCase(const std::string& input, |
+ bool cap_next_letter, |
+ bool preserve_period); |
inline std::string UnderscoresToCamelCase(const std::string& input, bool cap_next_letter) { |
return UnderscoresToCamelCase(input, cap_next_letter, false); |
@@ -90,22 +94,28 @@ inline std::string UnderscoresToCamelCase(const std::string& input, bool cap_nex |
std::string UnderscoresToPascalCase(const std::string& input); |
+// Note that we wouldn't normally want to export this (we're not expecting |
+// it to be used outside libprotoc itself) but this exposes it for testing. |
+std::string LIBPROTOBUF_EXPORT GetEnumValueName(const std::string& enum_name, const std::string& enum_value_name); |
+ |
// TODO(jtattermusch): perhaps we could move this to strutil |
std::string StringToBase64(const std::string& input); |
std::string FileDescriptorToBase64(const FileDescriptor* descriptor); |
-FieldGeneratorBase* CreateFieldGenerator(const FieldDescriptor* descriptor, int fieldOrdinal); |
+FieldGeneratorBase* CreateFieldGenerator(const FieldDescriptor* descriptor, |
+ int fieldOrdinal, |
+ const Options* options); |
-// Determines whether the given message is a map entry message, i.e. one implicitly created |
-// by protoc due to a map<key, value> field. |
+// Determines whether the given message is a map entry message, |
+// i.e. one implicitly created by protoc due to a map<key, value> field. |
inline bool IsMapEntryMessage(const Descriptor* descriptor) { |
return descriptor->options().map_entry(); |
} |
-// Determines whether we're generating code for the proto representation of descriptors etc, |
-// for use in the runtime. This is the only type which is allowed to use proto2 syntax, |
-// and it generates internal classes. |
+// Determines whether we're generating code for the proto representation of |
+// descriptors etc, for use in the runtime. This is the only type which is |
+// allowed to use proto2 syntax, and it generates internal classes. |
inline bool IsDescriptorProto(const FileDescriptor* descriptor) { |
return descriptor->name() == "google/protobuf/descriptor.proto"; |
} |