fix some linux icc issues close[t:1975]

git-svn-id: file:///svn/toku/tokudb@14305 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/brt.c

@@ -2154,7 +2154,7 @@ brt_merge_child (BRT t, BRTNODE node, int childnum_to_merge, BOOL *did_io, BOOL
         if (childa->height>0) { int i; for (i=0; i+1<childa->u.n.n_children; i++) assert(childa->u.n.childkeys[i]); }
         //(toku_verify_counts(childa), toku_verify_estimates(t,childa));
         // the tree did react if a merge (did_merge) or rebalance (new spkit key) occurred
-        *did_react = did_merge || did_rebalance;
+        *did_react = (BOOL)(did_merge || did_rebalance);
         if (did_merge) assert(!splitk_kvpair); else assert(splitk_kvpair);
         if (r!=0) goto return_r;
 

newbrt/fifo_msg.c

@@ -89,7 +89,7 @@ fifo_msg_get_val(FIFO_MSG fifo_msg) {
 
 brt_msg_type
 fifo_msg_get_type(FIFO_MSG fifo_msg) {
-    brt_msg_type rval = fifo_msg->type;
+    brt_msg_type rval = (brt_msg_type) fifo_msg->type;
     return rval;
 }
 

newbrt/logcursor.c

@@ -34,7 +34,7 @@ static void lc_print_logcursor (TOKULOGCURSOR lc)  {
     printf("  cur_logfiles_index = %d\n", lc->cur_logfiles_index);
     printf("  cur_fp = %p\n", lc->cur_fp);
     printf("  cur_lsn = %"PRIu64"\n", lc->cur_lsn.lsn);
-    printf("  last_direction = %d\n", lc->last_direction);
+    printf("  last_direction = %d\n", (int) lc->last_direction);
 }
 
 static int lc_close_cur_logfile(TOKULOGCURSOR lc) {

newbrt/ule.c

@@ -382,7 +382,7 @@ le_pack(ULE ule,                            // data to be packed into new leafen
         int i;
         for (i = ule->num_uxrs - 1; i >= 0; i--) {
             if (uxr_is_insert(&ule->uxrs[i])) {
-                index_of_innermost_insert = i;
+                index_of_innermost_insert = (u_int8_t) i;
                 vallen_innermost_insert   = ule->uxrs[i].vallen;
                 valp_innermost_insert     = ule->uxrs[i].valp;
                 goto found_insert;
@@ -1392,7 +1392,7 @@ ule_add_placeholders(ULE ule, XIDS xids) {
 
 static inline BOOL
 uxr_type_is_insert(u_int8_t type) {
-    BOOL rval = (type == XR_INSERT);
+    BOOL rval = (BOOL)(type == XR_INSERT);
     return rval;
 }
 
@@ -1403,7 +1403,7 @@ uxr_is_insert(UXR uxr) {
 
 static inline BOOL
 uxr_type_is_delete(u_int8_t type) {
-    BOOL rval = (type == XR_DELETE);
+    BOOL rval = (BOOL)(type == XR_DELETE);
     return rval;
 }
 
@@ -1414,7 +1414,7 @@ uxr_is_delete(UXR uxr) {
 
 static inline BOOL
 uxr_type_is_placeholder(u_int8_t type) {
-    BOOL rval = (type == XR_PLACEHOLDER);
+    BOOL rval = (BOOL)(type == XR_PLACEHOLDER);
     return rval;
 }