refs #5351 clang compilation cleanup after 5351 merge

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

locktree/lock_request.cc

@@ -26,7 +26,7 @@ void lock_request::create(uint64_t wait_time) {
     m_state = state::UNINITIALIZED;
 
     m_wait_time = wait_time;
-    m_wait_cond = TOKU_COND_INITIALIZER;
+    toku_cond_init(&m_wait_cond, nullptr);
 }
 
 // destroy a lock request.
@@ -152,7 +152,8 @@ void lock_request::calculate_cond_wakeup_time(struct timespec *ts) {
     int64_t usec = now.tv_usec + ((m_wait_time % 1000) * 1000);
     int64_t d_sec = usec / 1000000;
     int64_t d_usec = usec % 1000000;
-    *ts = { sec + d_sec, d_usec * 1000 };
+    ts->tv_sec = sec + d_sec;
+    ts->tv_nsec = d_usec * 1000;
 }
 
 // sleep on the lock request until it becomes resolved or the wait time has elapsed.

locktree/locktree.cc

@@ -192,7 +192,8 @@ int locktree::acquire_lock(bool is_write_request, TXNID txnid,
             remove_row_lock(&lkr, lock, m_mem_tracker);
         }
 
-        lock = { .range = requested_range, .txnid = txnid };
+        lock.range = requested_range;
+        lock.txnid = txnid;
         insert_row_lock(&lkr, lock, m_mem_tracker);
     }
 

locktree/tests/concurrent_tree_lkr_insert_remove.cc

@@ -40,9 +40,9 @@ static uint64_t check_for_range_and_count(concurrent_tree::locked_keyrange *lkr,
         keyrange target_range;
         bool target_range_found;
 
-        bool fn(const keyrange &range, TXNID txnid) { 
+        bool fn(const keyrange &query_range, TXNID txnid) { 
             (void) txnid;
-            if (range.compare(cmp, target_range) == keyrange::comparison::EQUALS) {
+            if (query_range.compare(cmp, target_range) == keyrange::comparison::EQUALS) {
                 invariant(!target_range_found);
                 target_range_found = true;
             }

locktree/txnid_set.cc

@@ -9,7 +9,8 @@
 
 namespace toku {
 
-static int find_by_txnid(const TXNID &txnid_a, const TXNID &txnid_b) {
+int find_by_txnid(const TXNID &txnid_a, const TXNID &txnid_b);
+int find_by_txnid(const TXNID &txnid_a, const TXNID &txnid_b) {
     if (txnid_a < txnid_b) {
         return -1;
     } else if (txnid_a == txnid_b) {

src/ydb_row_lock.cc

@@ -26,7 +26,9 @@ static DB_TXN *txn_oldest_ancester(DB_TXN* txn) {
     return txn;
 }
 
-static int find_key_ranges_by_lt(const txn_lt_key_ranges &ranges,
+int find_key_ranges_by_lt(const txn_lt_key_ranges &ranges,
+        toku::locktree *const &find_lt);
+int find_key_ranges_by_lt(const txn_lt_key_ranges &ranges,
         toku::locktree *const &find_lt) {
     return ranges.lt->compare(find_lt);
 }