AliceO2Group
diff --git a/‎Algorithm/test/pageparser.cxx‎
Lines changed: 1 addition & 1 deletion b/‎Algorithm/test/pageparser.cxx‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎DataFormats/Headers/include/Headers/DataHeader.h‎
Lines changed: 2 additions & 0 deletions b/‎DataFormats/Headers/include/Headers/DataHeader.h‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Framework/Core/test/test_ASoA.cxx‎
Lines changed: 4 additions & 4 deletions b/‎Framework/Core/test/test_ASoA.cxx‎
Lines changed: 4 additions & 4 deletions
@@ -50,7 +50,7 @@ struct ClusterData {
   {
   }
 
-  bool operator==(const ClusterData& rhs)
+  bool operator==(const ClusterData& rhs) const
   {
     return clusterid == rhs.clusterid && x == rhs.x && y == rhs.y && z == rhs.z && e == rhs.e;
   }
 
@@ -286,6 +286,8 @@ struct Descriptor {
   bool operator<(const Descriptor& other) const { return std::memcmp(this->str, other.str, N) < 0; }
   bool operator!=(const Descriptor& other) const { return not this->operator==(other); }
 
+  // Convesion operators for comparison with their implicitly convertible types
+  friend bool operator==(const Descriptor& lhs, ImplicitConversion rhs) { return static_cast<ImplicitConversion>(lhs) == rhs; }
   // explicitly forbid comparison with e.g. const char* strings
   // use: value == Descriptor<N>("DESC") for the appropriate
   // template instantiation instead
 
@@ -147,10 +147,10 @@ TEST_CASE("TestTableIteration")
 
   b = tests2.begin();
   REQUIRE(b != e);
-  REQUIRE((b + 1) == (b + 1));
-  REQUIRE((b + 7) != b);
-  REQUIRE((b + 7) != e);
-  REQUIRE((b + 8) == e);
+  REQUIRE(((b + 1) == (b + 1)));
+  REQUIRE(((b + 7) != b));
+  REQUIRE(((b + 7) != e));
+  REQUIRE(((b + 8) == e));
 
   for (auto& t : tests2) {
     REQUIRE(t.x() == value / 4);
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ struct ClusterData {`
`50`	`50`	`{`
`51`	`51`	`}`
`52`	`52`
`53`		`- bool operator==(const ClusterData& rhs)`
	`53`	`+ bool operator==(const ClusterData& rhs) const`
`54`	`54`	`{`
`55`	`55`	`return clusterid == rhs.clusterid && x == rhs.x && y == rhs.y && z == rhs.z && e == rhs.e;`
`56`	`56`	`}`