Commit 10694880 authored by John Esmet's avatar John Esmet

Fix the OSX build

parent e7b5861d
...@@ -315,9 +315,9 @@ serialize_nonleaf_childinfo(NONLEAF_CHILDINFO bnc, struct wbuf *wb) ...@@ -315,9 +315,9 @@ serialize_nonleaf_childinfo(NONLEAF_CHILDINFO bnc, struct wbuf *wb)
FIFO_ITERATE( FIFO_ITERATE(
bnc->buffer, key, keylen, data, datalen, type, msn, xids, is_fresh, bnc->buffer, key, keylen, data, datalen, type, msn, xids, is_fresh,
{ {
paranoid_invariant((int)type>=0 && type<256); paranoid_invariant((int) type >= 0 && (int) type < 256);
wbuf_nocrc_char(wb, (unsigned char)type); wbuf_nocrc_char(wb, (unsigned char) type);
wbuf_nocrc_char(wb, (unsigned char)is_fresh); wbuf_nocrc_char(wb, (unsigned char) is_fresh);
wbuf_MSN(wb, msn); wbuf_MSN(wb, msn);
wbuf_nocrc_xids(wb, xids); wbuf_nocrc_xids(wb, xids);
wbuf_nocrc_bytes(wb, key, keylen); wbuf_nocrc_bytes(wb, key, keylen);
......
...@@ -1185,7 +1185,7 @@ void dmt<dmtdata_t, dmtdataout_t, dmtwriter_t>::builder::append(const dmtwriter_ ...@@ -1185,7 +1185,7 @@ void dmt<dmtdata_t, dmtdataout_t, dmtwriter_t>::builder::append(const dmtwriter_
paranoid_invariant(this->temp_valid); paranoid_invariant(this->temp_valid);
//NOTE: Always use d.a.num_values for size because we have not yet created root. //NOTE: Always use d.a.num_values for size because we have not yet created root.
if (this->temp.values_same_size && (this->temp.d.a.num_values == 0 || value.get_size() == this->temp.value_length)) { if (this->temp.values_same_size && (this->temp.d.a.num_values == 0 || value.get_size() == this->temp.value_length)) {
this->temp.insert_at_array_end<false>(value); temp.insert_at_array_end<false>(value);
return; return;
} }
if (this->temp.is_array) { if (this->temp.is_array) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment