Merge pull request #3675 from tautschnig/vs-shadow-util

tautschnig · web-flow · commit 9faabf0bcc53 · 2019-01-04T16:05:12.000+01:00
Do not shadow local variable "p" [blocks: #2310]
diff --git a/src/util/std_types.h b/src/util/std_types.h
@@ -948,10 +948,10 @@ class code_typet:public typet
   parameter_indicest parameter_indices() const
   {
     parameter_indicest parameter_indices;
-    const parameterst &p = parameters();
-    parameter_indices.reserve(p.size());
+    const parameterst &params = parameters();
+    parameter_indices.reserve(params.size());
     std::size_t index = 0;
-    for(const auto &p : parameters())
+    for(const auto &p : params)
     {
       const irep_idt &id = p.get_identifier();
       if(!id.empty())

Original file line number	Diff line number	Diff line change
`@@ -948,10 +948,10 @@ class code_typet:public typet`
`948`	`948`	`parameter_indicest parameter_indices() const`
`949`	`949`	`{`
`950`	`950`	`parameter_indicest parameter_indices;`
`951`		`- const parameterst &p = parameters();`
`952`		`- parameter_indices.reserve(p.size());`
	`951`	`+ const parameterst &params = parameters();`
	`952`	`+ parameter_indices.reserve(params.size());`
`953`	`953`	`std::size_t index = 0;`
`954`		`- for(const auto &p : parameters())`
	`954`	`+ for(const auto &p : params)`
`955`	`955`	`{`
`956`	`956`	`const irep_idt &id = p.get_identifier();`
`957`	`957`	`if(!id.empty())`