Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Please consider the following formatting changes to #12213 #230

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Algorithm/test/pageparser.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 2 additions & 0 deletions DataFormats/Headers/include/Headers/DataHeader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Framework/Core/test/test_ASoA.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down