Merge pull request #1886 from ApexAI/iox-1884-optional-inequality-operator-fix

elfenpiff · web-flow · commit e04365667629 · 2023-02-08T16:44:01.000+01:00
iox-#1884 Use inequality operator of underlying type in optional ineq…
diff --git a/iceoryx_hoofs/vocabulary/include/iox/detail/optional.inl b/iceoryx_hoofs/vocabulary/include/iox/detail/optional.inl
@@ -306,7 +306,10 @@ bool operator==(const optional<T>& lhs, const optional<T>& rhs) noexcept
 template <typename T>
 bool operator!=(const optional<T>& lhs, const optional<T>& rhs) noexcept
 {
-    return !(lhs == rhs);
+    const auto onlyLhsNul = !lhs.has_value() && rhs.has_value();
+    const auto onlyRhsNul = lhs.has_value() && !rhs.has_value();
+    const auto bothValuesUnequal = (lhs.has_value() && rhs.has_value()) && (*lhs != *rhs);
+    return bothValuesUnequal || onlyRhsNul || onlyLhsNul;
 }
 
 // AXIVION DISABLE STYLE AutosarC++19_03-A13.5.5: Comparison with nullopt_t is required

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,10 @@ bool operator==(const optional<T>& lhs, const optional<T>& rhs) noexcept`
`306`	`306`	`template <typename T>`
`307`	`307`	`bool operator!=(const optional<T>& lhs, const optional<T>& rhs) noexcept`
`308`	`308`	`{`
`309`		`- return !(lhs == rhs);`
	`309`	`+ const auto onlyLhsNul = !lhs.has_value() && rhs.has_value();`
	`310`	`+ const auto onlyRhsNul = lhs.has_value() && !rhs.has_value();`
	`311`	`+ const auto bothValuesUnequal = (lhs.has_value() && rhs.has_value()) && (lhs != rhs);`
	`312`	`+ return bothValuesUnequal \|\| onlyRhsNul \|\| onlyLhsNul;`
`310`	`313`	`}`
`311`	`314`
`312`	`315`	`// AXIVION DISABLE STYLE AutosarC++19_03-A13.5.5: Comparison with nullopt_t is required`