diff options
| author | Jon Skeet <skeet@pobox.com> | 2008-08-14 20:35:26 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2008-08-14 20:35:26 +0100 |
| commit | 9134a21f27728996237010449fe9273b3bf4be78 (patch) | |
| tree | 0959076d9a9bf56e05597dd2fd7da18fb47517ad | |
| parent | cabd06d12fd7bd53c1896e8f77617cc00de70c4c (diff) | |
| download | protobuf-9134a21f27728996237010449fe9273b3bf4be78.tar.gz protobuf-9134a21f27728996237010449fe9273b3bf4be78.tar.bz2 protobuf-9134a21f27728996237010449fe9273b3bf4be78.zip | |
Tweaks
| -rw-r--r-- | CSHARP-README.txt | 4 | ||||
| -rw-r--r-- | java/src/test/java/com/google/protobuf/multiple_files_test.proto | 6 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_message.cc | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/CSHARP-README.txt b/CSHARP-README.txt index 445587a8..11502f53 100644 --- a/CSHARP-README.txt +++ b/CSHARP-README.txt @@ -37,4 +37,6 @@ o There's a mixture of generic and non-generic code. This o Nested types always end up under a "Types" static class which is merely present to avoid name clashes. o FileDescriptor.FindByName has been made generic to allow simple - type-safe searching for any nested type.
\ No newline at end of file + type-safe searching for any nested type. +o No enum.valueOf for enums (due to them being simple C# enums) +o Public Builder constructors to aid C# object/collection initializers diff --git a/java/src/test/java/com/google/protobuf/multiple_files_test.proto b/java/src/test/java/com/google/protobuf/multiple_files_test.proto index 1dbadfe0..2c6f33a6 100644 --- a/java/src/test/java/com/google/protobuf/multiple_files_test.proto +++ b/java/src/test/java/com/google/protobuf/multiple_files_test.proto @@ -26,6 +26,12 @@ package protobuf_unittest; option java_multiple_files = true; option java_outer_classname = "MultipleFilesTestProto"; +option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; +option csharp_file_classname = "MultiFileProto"; +option csharp_multiple_files = true; +option csharp_nest_classes = false; +option csharp_public_classes = true; + message MessageWithNoOuter { message NestedMessage { optional int32 i = 1; diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc index af7cf410..af4337c8 100644 --- a/src/google/protobuf/compiler/csharp/csharp_message.cc +++ b/src/google/protobuf/compiler/csharp/csharp_message.cc @@ -215,9 +215,6 @@ void MessageGenerator::Generate(io::Printer* printer) { } printer->Indent(); printer->Print( - "// Use $classname$.CreateBuilder() to construct.\r\n" - "private $classname$() {}\r\n" - "\r\n" "private static readonly $classname$ defaultInstance = new $classname$();\r\n" "public static $classname$ DefaultInstance {\r\n" " get { return defaultInstance; }\r\n" @@ -383,7 +380,7 @@ GenerateParseFromMethods(io::Printer* printer) { "public static $classname$ ParseFrom(byte[] data) {\r\n" " return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();\r\n" "}\r\n" - "public static $classname$ parseFrom(byte[] data,\r\n" + "public static $classname$ ParseFrom(byte[] data,\r\n" " pb::ExtensionRegistry extensionRegistry) {\r\n" " return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))\r\n" " .BuildParsed();\r\n" |