diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2016-11-23 11:26:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 11:26:31 -0800 |
| commit | 39f9b43219bc5718b659ed72a2130a7b2ce66108 (patch) | |
| tree | e48fe16afc2e1d868408e9453fff521d6ddcd4ae /js/test.proto | |
| parent | c9504715634948c9f8f306330449f296d926b74e (diff) | |
| parent | 65479cb7b1f99ab957da68abce17feb68a9e1cf0 (diff) | |
| download | protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.tar.gz protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.tar.bz2 protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.zip | |
Merge pull request #2403 from google/down-integrate-with-msvc-fix
Integrated internal changes from Google
Diffstat (limited to 'js/test.proto')
| -rw-r--r-- | js/test.proto | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/test.proto b/js/test.proto index db238e1a..2be5b8c1 100644 --- a/js/test.proto +++ b/js/test.proto @@ -234,7 +234,9 @@ message TestEndsWithBytes { optional bytes data = 2; } + message TestMapFieldsNoBinary { + map<string, string> map_string_string = 1; map<string, int32> map_string_int32 = 2; map<string, int64> map_string_int64 = 3; @@ -258,6 +260,7 @@ enum MapValueEnumNoBinary { } message MapValueMessageNoBinary { + optional int32 foo = 1; } |