Skip to content
Snippets Groups Projects
Commit 799079f4 authored by Tomasz Kozak's avatar Tomasz Kozak
Browse files

Improve variable naming in ExceptionHandlingDecorator.

parent 71180027
No related branches found
No related tags found
No related merge requests found
......@@ -49,8 +49,8 @@ namespace ChimeraTK {
protected:
DeviceModule& deviceModule;
DataValidity validity{DataValidity::ok};
bool genericTransfer(std::function<bool(void)> callable, bool invalidateOnFailure = true);
DataValidity localValidity{DataValidity::ok};
bool genericTransfer(std::function<bool(void)> callable, bool updateOwnerValidityFlag = true);
void setOwnerValidity(DataValidity newValidity);
EntityOwner* _owner = {nullptr};
};
......
......@@ -9,8 +9,8 @@ namespace ChimeraTK {
template<typename UserType>
void ExceptionHandlingDecorator<UserType>::setOwnerValidity(DataValidity newValidity) {
if (newValidity != validity) {
validity = newValidity;
if (newValidity != localValidity) {
localValidity = newValidity;
if (!_owner) return;
if (newValidity == DataValidity::faulty) {
_owner->incrementDataFaultCounter();
......@@ -78,8 +78,7 @@ namespace ChimeraTK {
template<typename UserType>
bool ExceptionHandlingDecorator<UserType>::doReadTransferNonBlocking() {
return genericTransfer(
[this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransferNonBlocking(); });
return genericTransfer( [this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransferNonBlocking(); });
}
template<typename UserType>
......@@ -127,7 +126,7 @@ namespace ChimeraTK {
return delegatedValidity;
}
return validity;
return localValidity;
}
template<typename UserType>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment