diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-08-18 16:25:35 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-08-18 16:25:35 -0700 |
| commit | 139775ccc040a07e07c5407e34834dab27928cbc (patch) | |
| tree | c500f4eabfea9d2e059f18b7d612c6e2a2db3ad5 /js/test.proto | |
| parent | 1825d6d8f0aedcd7966c5c137a71e46ae650b3da (diff) | |
| parent | 26ac3e8e242f1cd6de15291a9973905a14b546ba (diff) | |
| download | protobuf-139775ccc040a07e07c5407e34834dab27928cbc.tar.gz protobuf-139775ccc040a07e07c5407e34834dab27928cbc.tar.bz2 protobuf-139775ccc040a07e07c5407e34834dab27928cbc.zip | |
Merge remote-tracking branch 'origin/3.4.x' into mergemaster
Diffstat (limited to 'js/test.proto')
| -rw-r--r-- | js/test.proto | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/js/test.proto b/js/test.proto index 2be5b8c1..7c881c0d 100644 --- a/js/test.proto +++ b/js/test.proto @@ -235,6 +235,13 @@ message TestEndsWithBytes { } +message Int64Types { + optional int64 int64_normal = 1 [jstype=JS_NORMAL]; + optional sint64 int64_string = 2 [jstype=JS_STRING]; + optional uint64 int64_number = 3 [jstype=JS_NUMBER]; + +} + message TestMapFieldsNoBinary { map<string, string> map_string_string = 1; @@ -271,3 +278,4 @@ message Deeply { } } } + |