From 44eba17add8d1f7c5bf2580c2bbd948276eec5f3 Mon Sep 17 00:00:00 2001
From: Cedric CAFFY <cedric.caffy@cern.ch>
Date: Wed, 4 Mar 2020 14:16:21 +0100
Subject: [PATCH] Changed the StorageClass operator== so that it only compare
on the names of the storage classes
---
common/dataStructures/StorageClass.cpp | 2 +-
common/dataStructures/StorageClass.hpp | 4 ++--
common/dataStructures/StorageClassTest.cpp | 6 ------
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/common/dataStructures/StorageClass.cpp b/common/dataStructures/StorageClass.cpp
index ba62a00b4a..8f3f0d76d1 100644
--- a/common/dataStructures/StorageClass.cpp
+++ b/common/dataStructures/StorageClass.cpp
@@ -34,7 +34,7 @@ StorageClass::StorageClass():
// operator==
//------------------------------------------------------------------------------
bool StorageClass::operator==(const StorageClass &rhs) const {
- return diskInstance==rhs.diskInstance && name==rhs.name;
+ return name==rhs.name;
}
//------------------------------------------------------------------------------
diff --git a/common/dataStructures/StorageClass.hpp b/common/dataStructures/StorageClass.hpp
index bc00a57260..4e4f9e4f33 100644
--- a/common/dataStructures/StorageClass.hpp
+++ b/common/dataStructures/StorageClass.hpp
@@ -47,9 +47,9 @@ struct StorageClass {
* this one.
*
* Please note that two StorageClass objects are considered equal if and only
- * if both their diskInstance and name member-variables match, i.e.
+ * if their name member-variables match, i.e.
*
- * diskInstance==rhs.diskInstance && name==rhs.name;
+ * name==rhs.name;
*
* All other member-variables are intentionally ignored by this equality
* operator.
diff --git a/common/dataStructures/StorageClassTest.cpp b/common/dataStructures/StorageClassTest.cpp
index ef869cc66f..e4a4414fe9 100644
--- a/common/dataStructures/StorageClassTest.cpp
+++ b/common/dataStructures/StorageClassTest.cpp
@@ -100,12 +100,6 @@ TEST_F(cta_common_dataStructures_StorageClassTest, equality_different_objects_di
ASSERT_EQ(m_storageClass1DiskInstance1, m_storageClass1DiskInstance1EffectiveCopy);
}
-TEST_F(cta_common_dataStructures_StorageClassTest, inequality_different_disk_instance) {
- using namespace cta::common::dataStructures;
-
- ASSERT_NE(m_storageClass1DiskInstance1, m_storageClass1DiskInstance2);
-}
-
TEST_F(cta_common_dataStructures_StorageClassTest, inequality_different_name) {
using namespace cta::common::dataStructures;
--
GitLab