mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
reftable: avoid initializing structs from structs
Apparently, the IBM xlc compiler doesn't like this. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1ffcbaa1a5
commit
f2b255141b
|
@ -207,11 +207,11 @@ static void test_merged(void)
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
struct reftable_ref_record want[] = {
|
struct reftable_ref_record *want[] = {
|
||||||
r2[0],
|
&r2[0],
|
||||||
r1[1],
|
&r1[1],
|
||||||
r3[0],
|
&r3[0],
|
||||||
r3[1],
|
&r3[1],
|
||||||
};
|
};
|
||||||
|
|
||||||
struct reftable_ref_record *refs[] = { r1, r2, r3 };
|
struct reftable_ref_record *refs[] = { r1, r2, r3 };
|
||||||
|
@ -250,7 +250,7 @@ static void test_merged(void)
|
||||||
|
|
||||||
EXPECT(ARRAY_SIZE(want) == len);
|
EXPECT(ARRAY_SIZE(want) == len);
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
EXPECT(reftable_ref_record_equal(&want[i], &out[i],
|
EXPECT(reftable_ref_record_equal(want[i], &out[i],
|
||||||
GIT_SHA1_RAWSZ));
|
GIT_SHA1_RAWSZ));
|
||||||
}
|
}
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
|
@ -345,10 +345,10 @@ static void test_merged_logs(void)
|
||||||
.value_type = REFTABLE_LOG_DELETION,
|
.value_type = REFTABLE_LOG_DELETION,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
struct reftable_log_record want[] = {
|
struct reftable_log_record *want[] = {
|
||||||
r2[0],
|
&r2[0],
|
||||||
r3[0],
|
&r3[0],
|
||||||
r1[1],
|
&r1[1],
|
||||||
};
|
};
|
||||||
|
|
||||||
struct reftable_log_record *logs[] = { r1, r2, r3 };
|
struct reftable_log_record *logs[] = { r1, r2, r3 };
|
||||||
|
@ -387,7 +387,7 @@ static void test_merged_logs(void)
|
||||||
|
|
||||||
EXPECT(ARRAY_SIZE(want) == len);
|
EXPECT(ARRAY_SIZE(want) == len);
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
EXPECT(reftable_log_record_equal(&want[i], &out[i],
|
EXPECT(reftable_log_record_equal(want[i], &out[i],
|
||||||
GIT_SHA1_RAWSZ));
|
GIT_SHA1_RAWSZ));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue