DPL: fix comparison of DataDescriptorMatcher

ktf · ktf · commit e57f7e164e09 · 2018-12-17T10:31:40.000+01:00
StartTimeValueMatcher was neglected by accident.
diff --git a/Framework/Core/src/DataDescriptorMatcher.cxx b/Framework/Core/src/DataDescriptorMatcher.cxx
@@ -236,6 +236,14 @@ bool DataDescriptorMatcher::operator==(DataDescriptorMatcher const& other) const
     }
   }
 
+  {
+    auto v1 = std::get_if<StartTimeValueMatcher>(&this->mLeft);
+    auto v2 = std::get_if<StartTimeValueMatcher>(&other.mLeft);
+    if (v1 && v2 && *v1 == *v2) {
+      leftValue = true;
+    }
+  }
+
   {
     auto v1 = std::get_if<std::unique_ptr<DataDescriptorMatcher>>(&this->mLeft);
     auto v2 = std::get_if<std::unique_ptr<DataDescriptorMatcher>>(&other.mLeft);
@@ -285,6 +293,14 @@ bool DataDescriptorMatcher::operator==(DataDescriptorMatcher const& other) const
     }
   }
 
+  {
+    auto v1 = std::get_if<StartTimeValueMatcher>(&this->mRight);
+    auto v2 = std::get_if<StartTimeValueMatcher>(&other.mRight);
+    if (v1 && v2 && *v1 == *v2) {
+      return true;
+    }
+  }
+
   {
     auto v1 = std::get_if<std::unique_ptr<DataDescriptorMatcher>>(&this->mRight);
     auto v2 = std::get_if<std::unique_ptr<DataDescriptorMatcher>>(&other.mRight);

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,14 @@ bool DataDescriptorMatcher::operator==(DataDescriptorMatcher const& other) const`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`
	`239`	`+ {`
	`240`	`+ auto v1 = std::get_if<StartTimeValueMatcher>(&this->mLeft);`
	`241`	`+ auto v2 = std::get_if<StartTimeValueMatcher>(&other.mLeft);`
	`242`	`+ if (v1 && v2 && v1 == v2) {`
	`243`	`+ leftValue = true;`
	`244`	`+ }`
	`245`	`+ }`
	`246`	`+`
`239`	`247`	`{`
`240`	`248`	`auto v1 = std::get_if<std::unique_ptr<DataDescriptorMatcher>>(&this->mLeft);`
`241`	`249`	`auto v2 = std::get_if<std::unique_ptr<DataDescriptorMatcher>>(&other.mLeft);`
`@@ -285,6 +293,14 @@ bool DataDescriptorMatcher::operator==(DataDescriptorMatcher const& other) const`
`285`	`293`	`}`
`286`	`294`	`}`
`287`	`295`
	`296`	`+ {`
	`297`	`+ auto v1 = std::get_if<StartTimeValueMatcher>(&this->mRight);`
	`298`	`+ auto v2 = std::get_if<StartTimeValueMatcher>(&other.mRight);`
	`299`	`+ if (v1 && v2 && v1 == v2) {`
	`300`	`+ return true;`
	`301`	`+ }`
	`302`	`+ }`
	`303`	`+`
`288`	`304`	`{`
`289`	`305`	`auto v1 = std::get_if<std::unique_ptr<DataDescriptorMatcher>>(&this->mRight);`
`290`	`306`	`auto v2 = std::get_if<std::unique_ptr<DataDescriptorMatcher>>(&other.mRight);`