rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'kylemanna' into merge

Browse source 
Conflicts: (manually resolved)
	capn-malloc.c
	capn-stream.c
	capn-test.cpp
	capn.c
	capn.h
	compiler/capnpc-c.c
This commit is contained in:
David Lamparter 2016-02-28 12:32:59 +01:00
commit 02268ff818
5 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
capn-test.cpp
View file

@ -274,11 +274,11 @@ static void getSegments(struct capn *c, struct capn_segment **s, size_t num) {
ASSERT_EQ(num, c->segnum);
s[0] = c->seglist;
for (unsigned i = 1; i < num; i++) {
for (size_t i = 1; i < num; i++) {
s[i] = s[i-1]->next;
}
for (unsigned i = 0; i < num; i++) {
for (size_t i = 0; i < num; i++) {
EXPECT_EQ(s[i]->id, i);
}
}
@ -315,7 +315,7 @@ TEST(WireFormat, StructRoundTrip_OneSegmentPerAllocation) {
struct capn ctx2;
memset(&ctx2, 0, sizeof(ctx2));
for (unsigned i = 0; i < sizeof(segments)/sizeof(segments[0]); i++) {
for (size_t i = 0; i < sizeof(segments)/sizeof(segments[0]); i++) {
capn_append_segment(&ctx2, segments[i]);
}
@ -371,7 +371,7 @@ TEST(WireFormat, StructRoundTrip_OneSegmentPerAllocation_NoTag) {
struct capn ctx2;
memset(&ctx2, 0, sizeof(ctx2));
for (unsigned i = 0; i < sizeof(segments)/sizeof(segments[0]); i++) {
for (size_t i = 0; i < sizeof(segments)/sizeof(segments[0]); i++) {
capn_append_segment(&ctx2, segments[i]);
}
@ -421,7 +421,7 @@ TEST(WireFormat, StructRoundTrip_MultipleSegmentsWithMultipleAllocations) {
struct capn ctx2;
memset(&ctx2, 0, sizeof(ctx2));
for (unsigned i = 0; i < sizeof(segments)/sizeof(segments[0]); i++) {
for (size_t i = 0; i < sizeof(segments)/sizeof(segments[0]); i++) {
capn_append_segment(&ctx2, segments[i]);
}