Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d8df67b

Browse files
committed
Fix final compiler warning produced by -Wshadow=compatible-local
We're now able to compile the entire tree with -Wshadow=compatible-local without any compiler warnings. Author: David Rowley Discussion: https://postgr.es/m/CAApHDvqWGMdB_pATeUqE=JCtNqNxObPOJ00jFEa2_sZ20j_Wvg@mail.gmail.com
1 parent 112f022 commit d8df67b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/bin/pgbench/pgbench.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7506,17 +7506,17 @@ threadRun(void *arg)
75067506
/* progress report is made by thread 0 for all threads */
75077507
if (progress && thread->tid == 0)
75087508
{
7509-
pg_time_usec_t now = pg_time_now();
7509+
pg_time_usec_t now2 = pg_time_now();
75107510

7511-
if (now >= next_report)
7511+
if (now2 >= next_report)
75127512
{
75137513
/*
75147514
* Horrible hack: this relies on the thread pointer we are
75157515
* passed to be equivalent to threads[0], that is the first
75167516
* entry of the threads array. That is why this MUST be done
75177517
* by thread 0 and not any other.
75187518
*/
7519-
printProgressReport(thread, thread_start, now,
7519+
printProgressReport(thread, thread_start, now2,
75207520
&last, &last_report);
75217521

75227522
/*
@@ -7526,7 +7526,7 @@ threadRun(void *arg)
75267526
do
75277527
{
75287528
next_report += (int64) 1000000 * progress;
7529-
} while (now >= next_report);
7529+
} while (now2 >= next_report);
75307530
}
75317531
}
75327532
}

0 commit comments

Comments
 (0)