From 725b48a5de1266b47278d184027d782b68d8c16e Mon Sep 17 00:00:00 2001
From: Christoph Kampmeyer <christoph.kampmeyer@desy.de>
Date: Wed, 8 Jul 2020 20:45:24 +0200
Subject: [PATCH] MetaDataPropagatingRegisterDecorator: Clean up
Removed obsolete localValidity.
---
include/MetaDataPropagatingRegisterDecorator.h | 2 --
src/MetaDataPropagatingRegisterDecorator.cc | 8 +-------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/include/MetaDataPropagatingRegisterDecorator.h b/include/MetaDataPropagatingRegisterDecorator.h
index 54987834..8a56a57c 100644
--- a/include/MetaDataPropagatingRegisterDecorator.h
+++ b/include/MetaDataPropagatingRegisterDecorator.h
@@ -30,8 +30,6 @@ namespace ChimeraTK {
/** value of validity flag from last read operation */
DataValidity lastValidity{DataValidity::ok};
- /** value of validity flag from user */
- DataValidity localValidity{DataValidity::ok};
};
DECLARE_TEMPLATE_FOR_CHIMERATK_USER_TYPES(MetaDataPropagatingRegisterDecorator);
diff --git a/src/MetaDataPropagatingRegisterDecorator.cc b/src/MetaDataPropagatingRegisterDecorator.cc
index e3027e26..976c6604 100644
--- a/src/MetaDataPropagatingRegisterDecorator.cc
+++ b/src/MetaDataPropagatingRegisterDecorator.cc
@@ -25,13 +25,7 @@ namespace ChimeraTK {
template<typename T>
void MetaDataPropagatingRegisterDecorator<T>::doPreWrite(TransferType type, VersionNumber versionNumber) {
- if(localValidity == DataValidity::faulty) {
- ChimeraTK::NDRegisterAccessorDecorator<T>::setDataValidity(DataValidity::faulty);
- }
- else {
- ChimeraTK::NDRegisterAccessorDecorator<T>::setDataValidity(_owner->getDataValidity());
- }
-
+ ChimeraTK::NDRegisterAccessorDecorator<T>::setDataValidity(_owner->getDataValidity());
NDRegisterAccessorDecorator<T, T>::doPreWrite(type, versionNumber);
}
--
GitLab