3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-28 06:10:53 +08:00
Code Issues Projects Releases Wiki Activity
271 Commits 6 Branches 16 Tags 2.2 MiB
Commit Graph

4 Commits

Author SHA1 Message Date
Ilya Lipnitskiy
f4b9fd20a5 protobuf-c/protobuf-c.c: add functionality to merge multiple instances 
of the same field on the wire (Fixes #91)
t/generated-code2/test-generated-code2.c: add a test case for merging
messages
t/test-full.proto: expand message definitions to test for merging nested
messages
 2013-11-22 15:34:07 -08:00
Robert Edmonds
3128296851 t/test-full.proto: revert 'option allow_alias = true;' 
this option is only supported by the upstream protobuf compiler starting
with version 2.5.0. this version is not yet widely available in the
debian/ubuntu repositories, and we would like to avoid breaking the
build on those platforms with the distribution version of protobuf
installed, so revert the following commits:

 - 5ee9c03478ea13bba03e7d7edacf723f324200c2
 - 84e41e7329f1f0fc09b41ee96e17b28a792cefcf
 2013-11-18 13:00:44 -05:00
Robert Edmonds
5ee9c03478 t/test-full.proto: add 'option allow_alias = true;' to silence warnings from the protobuf compiler 2013-11-16 18:08:51 -05:00
Robert Edmonds
cd2c8a5835 t/: fix paths to generated protobuf code 2013-11-16 17:32:26 -05:00