From daecc22a706cb321f92a9e7fa40cee2288622353 Mon Sep 17 00:00:00 2001 From: "Adi Shavit @ MacBookPro" Date: Wed, 3 Aug 2016 10:34:39 +0300 Subject: [PATCH] Removes variable name hiding by renaming variables with the same name in a nested scope. --- lib/algo/async_schedule.cpp | 8 ++++---- lib/io/iostats.cpp | 12 ++++++------ lib/io/wfs_file_base.cpp | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/algo/async_schedule.cpp b/lib/algo/async_schedule.cpp index b372fa4f7..9c5817c84 100644 --- a/lib/algo/async_schedule.cpp +++ b/lib/algo/async_schedule.cpp @@ -112,8 +112,8 @@ int_type simulate_async_write( if (oldtime != cur.timestamp) { // clear disk_busy - for (int_type i = 0; i <= D; i++) - disk_busy[i] = false; + for (int_type j = 0; j <= D; j++) + disk_busy[j] = false; oldtime = cur.timestamp; } @@ -157,8 +157,8 @@ int_type simulate_async_write( } assert(i == -1); - for (int_type i = 0; i <= D; i++) - assert(disk_queues[i].empty()); + for (int_type j = 0; j <= D; j++) + assert(disk_queues[j].empty()); return (oldtime - 1); } diff --git a/lib/io/iostats.cpp b/lib/io/iostats.cpp index d54e1cc70..348c2f83d 100644 --- a/lib/io/iostats.cpp +++ b/lib/io/iostats.cpp @@ -288,16 +288,16 @@ void stats::wait_finished(wait_op_type wait_op) p_waits += (acc_waits--) ? diff : 0.0; if (wait_op == WAIT_OP_READ) { - double diff = now - p_begin_wait_read; - t_wait_read += double(acc_wait_read) * diff; + double diff2 = now - p_begin_wait_read; + t_wait_read += double(acc_wait_read) * diff2; p_begin_wait_read = now; - p_wait_read += (acc_wait_read--) ? diff : 0.0; + p_wait_read += (acc_wait_read--) ? diff2 : 0.0; } else /* if (wait_op == WAIT_OP_WRITE) */ { - double diff = now - p_begin_wait_write; - t_wait_write += double(acc_wait_write) * diff; + double diff2 = now - p_begin_wait_write; + t_wait_write += double(acc_wait_write) * diff2; p_begin_wait_write = now; - p_wait_write += (acc_wait_write--) ? diff : 0.0; + p_wait_write += (acc_wait_write--) ? diff2 : 0.0; } #ifdef STXXL_WAIT_LOG_ENABLED std::ofstream* waitlog = stxxl::logger::get_instance()->waitlog_stream(); diff --git a/lib/io/wfs_file_base.cpp b/lib/io/wfs_file_base.cpp index 2fe983573..6698f1c84 100644 --- a/lib/io/wfs_file_base.cpp +++ b/lib/io/wfs_file_base.cpp @@ -100,11 +100,11 @@ static HANDLE open_file_impl(const std::string& filename, int mode) dwFlagsAndAttributes &= ~FILE_FLAG_NO_BUFFERING; - HANDLE file_des = ::CreateFileA(filename.c_str(), dwDesiredAccess, dwShareMode, NULL, + HANDLE file_des2 = ::CreateFileA(filename.c_str(), dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); - if (file_des != INVALID_HANDLE_VALUE) - return file_des; + if (file_des2 != INVALID_HANDLE_VALUE) + return file_des2; } #endif