Commitd8df67b

committed

Fix final compiler warning produced by -Wshadow=compatible-local

We're now able to compile the entire tree with -Wshadow=compatible-localwithout any compiler warnings.Author: David RowleyDiscussion:https://postgr.es/m/CAApHDvqWGMdB_pATeUqE=JCtNqNxObPOJ00jFEa2_sZ20j_Wvg@mail.gmail.com

1 parent112f022 commitd8df67bCopy full SHA for d8df67b

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7506,17 +7506,17 @@ threadRun(void *arg)`
`7506`	`7506`	`/* progress report is made by thread 0 for all threads */`
`7507`	`7507`	`if (progress&&thread->tid==0)`
`7508`	`7508`	`{`
`7509`		`-pg_time_usec_tnow=pg_time_now();`
	`7509`	`+pg_time_usec_tnow2=pg_time_now();`
`7510`	`7510`
`7511`		`-if (now >=next_report)`
	`7511`	`+if (now2 >=next_report)`
`7512`	`7512`	`{`
`7513`	`7513`	`/*`
`7514`	`7514`	`* Horrible hack: this relies on the thread pointer we are`
`7515`	`7515`	`* passed to be equivalent to threads[0], that is the first`
`7516`	`7516`	`* entry of the threads array. That is why this MUST be done`
`7517`	`7517`	`* by thread 0 and not any other.`
`7518`	`7518`	`*/`
`7519`		`-printProgressReport(thread,thread_start,now,`
	`7519`	`+printProgressReport(thread,thread_start,now2,`
`7520`	`7520`	`&last,&last_report);`
`7521`	`7521`
`7522`	`7522`	`/*`
`@@ -7526,7 +7526,7 @@ threadRun(void *arg)`
`7526`	`7526`	`do`
`7527`	`7527`	`{`
`7528`	`7528`	`next_report+= (int64)1000000*progress;`
`7529`		`-}while (now >=next_report);`
	`7529`	`+}while (now2 >=next_report);`
`7530`	`7530`	`}`
`7531`	`7531`	`}`
`7532`	`7532`	`}`

Comments

(0)