Removed redundant assignment (issue flann-lib#422)

tkircher · tkircher · commit cfc0a4531183 · 2021-04-11T23:03:20.000-08:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,5 @@
 Current
+        * Removed redundant assignment (issue #422 @fluber)
         * Removed unnecessary null checks before delete (issue #420 @elfring)
         * Reverted PR #424 due to lack of portability
         * fscanf fix (PR #467 @rdelfin)
diff --git a/src/cpp/flann/util/any.h b/src/cpp/flann/util/any.h
@@ -78,8 +78,10 @@ struct big_any_policy : typed_base_any_policy<T>
 {
     virtual void static_delete(void** x)
     {
-        if (* x) delete (* reinterpret_cast<T**>(x));
-	*x = NULL;
+        if (* x) {
+            delete (* reinterpret_cast<T**>(x));
+            *x = NULL;
+        }
     }
     virtual void copy_from_value(void const* src, void** dest)
     {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`Current`
	`2`	`+ * Removed redundant assignment (issue #422 @fluber)`
`2`	`3`	`* Removed unnecessary null checks before delete (issue #420 @elfring)`
`3`	`4`	`* Reverted PR #424 due to lack of portability`
`4`	`5`	`* fscanf fix (PR #467 @rdelfin)`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,10 @@ struct big_any_policy : typed_base_any_policy<T>`
`78`	`78`	`{`
`79`	`79`	`virtual void static_delete(void** x)`
`80`	`80`	`{`
`81`		`- if (* x) delete (* reinterpret_cast<T**>(x));`
`82`		`- *x = NULL;`
	`81`	`+ if (* x) {`
	`82`	`+ delete (* reinterpret_cast<T**>(x));`
	`83`	`+ *x = NULL;`
	`84`	`+ }`
`83`	`85`	`}`
`84`	`86`	`virtual void copy_from_value(void const* src, void** dest)`
`85`	`87`	`{`