Commit cfc64c2b authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#3676 get examples to compile with icc closes[t:3676]

git-svn-id: file:///svn/toku/tokudb@32675 c7de825b-a66e-492c-adef-691d508d4ae1
parent fb8c6c0a
...@@ -106,29 +106,29 @@ static int my_generate_row_for_put(DB *dest_db, DB *src_db, DBT *dest_key, DBT * ...@@ -106,29 +106,29 @@ static int my_generate_row_for_put(DB *dest_db, DB *src_db, DBT *dest_key, DBT *
case 1: case 1:
// dest_key = b,a // dest_key = b,a
dest_key->size = 2 * 8; dest_key->size = 2 * 8;
memcpy(dest_key->data + 0, src_val->data + 0, 8); memcpy((char *)dest_key->data + 0, (char *)src_val->data + 0, 8);
memcpy(dest_key->data + 8, src_key->data + 0, 8); memcpy((char *)dest_key->data + 8, (char *)src_key->data + 0, 8);
// dest_val = null // dest_val = null
dest_val->size = 0; dest_val->size = 0;
break; break;
case 2: case 2:
// dest_key = c,d,a // dest_key = c,d,a
dest_key->size = 3 * 8; dest_key->size = 3 * 8;
memcpy(dest_key->data + 0, src_val->data + 8, 8); memcpy((char *)dest_key->data + 0, (char *)src_val->data + 8, 8);
memcpy(dest_key->data + 8, src_val->data + 16, 8); memcpy((char *)dest_key->data + 8, (char *)src_val->data + 16, 8);
memcpy(dest_key->data + 16, src_key->data + 0, 8); memcpy((char *)dest_key->data + 16, (char *)src_key->data + 0, 8);
// dest_val = null // dest_val = null
dest_val->size = 0; dest_val->size = 0;
break; break;
case 3: case 3:
// dest_key = d,a // dest_key = d,a
dest_key->size = 2 * 8; dest_key->size = 2 * 8;
memcpy(dest_key->data + 0, src_val->data + 16, 8); memcpy((char *)dest_key->data + 0, (char *)src_val->data + 16, 8);
memcpy(dest_key->data + 8, src_key->data + 0, 8); memcpy((char *)dest_key->data + 8, (char *)src_key->data + 0, 8);
// dest_val = b,c // dest_val = b,c
dest_val->size = 2 * 8; dest_val->size = 2 * 8;
memcpy(dest_val->data + 0, src_val->data + 0, 8); memcpy((char *)dest_val->data + 0, (char *)src_val->data + 0, 8);
memcpy(dest_val->data + 8, src_val->data + 8, 8); memcpy((char *)dest_val->data + 8, (char *)src_val->data + 8, 8);
break; break;
default: default:
assert(0); assert(0);
...@@ -151,23 +151,23 @@ static int my_secondary_key(DB *db, const DBT *src_key, const DBT *src_val, DBT ...@@ -151,23 +151,23 @@ static int my_secondary_key(DB *db, const DBT *src_key, const DBT *src_val, DBT
case 1: case 1:
// dest_key = b,a // dest_key = b,a
dest_key->size = 2 * 8; dest_key->size = 2 * 8;
memcpy(dest_key->data + 0, src_val->data + 0, 8); memcpy((char *)dest_key->data + 0, (char *)src_val->data + 0, 8);
memcpy(dest_key->data + 8, src_key->data + 0, 8); memcpy((char *)dest_key->data + 8, (char *)src_key->data + 0, 8);
break; break;
case 2: case 2:
// dest_key = c,d,a // dest_key = c,d,a
dest_key->size = 3 * 8; dest_key->size = 3 * 8;
memcpy(dest_key->data + 0, src_val->data + 8, 8); memcpy((char *)dest_key->data + 0, (char *)src_val->data + 8, 8);
memcpy(dest_key->data + 8, src_val->data + 16, 8); memcpy((char *)dest_key->data + 8, (char *)src_val->data + 16, 8);
memcpy(dest_key->data + 16, src_key->data + 0, 8); memcpy((char *)dest_key->data + 16, (char *)src_key->data + 0, 8);
break; break;
case 3: case 3:
// dest_key = d,a,b,c // dest_key = d,a,b,c
dest_key->size = 4 * 8; dest_key->size = 4 * 8;
memcpy(dest_key->data + 0, src_val->data + 16, 8); memcpy((char *)dest_key->data + 0, (char *)src_val->data + 16, 8);
memcpy(dest_key->data + 8, src_key->data + 0, 8); memcpy((char *)dest_key->data + 8, (char *)src_key->data + 0, 8);
memcpy(dest_key->data + 16, src_val->data + 0, 8); memcpy((char *)dest_key->data + 16, (char *)src_val->data + 0, 8);
memcpy(dest_key->data + 24, src_val->data + 8, 8); memcpy((char *)dest_key->data + 24, (char *)src_val->data + 8, 8);
break; break;
default: default:
assert(0); assert(0);
......
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