From 5b56e73f4ce7809b690a779027c6a0d8f29efe18 Mon Sep 17 00:00:00 2001
From: Tomasz Kozak <tomasz.kozak@desy.de>
Date: Mon, 20 Jan 2020 16:07:57 +0100
Subject: [PATCH] removed doPreRead() / doPreWrite() , doPostRead() /
doPostWrite() from ExceptionHandlingDecorator - tests are now failing
---
include/ExceptionHandlingDecorator.h | 10 +++-------
src/ExceptionHandlingDecorator.cc | 26 +++++++++++---------------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/include/ExceptionHandlingDecorator.h b/include/ExceptionHandlingDecorator.h
index e0059854..ce7c4bba 100644
--- a/include/ExceptionHandlingDecorator.h
+++ b/include/ExceptionHandlingDecorator.h
@@ -34,13 +34,9 @@ namespace ChimeraTK {
TransferFuture doReadTransferAsync() override;
- void doPreRead() override;
- void doPostRead() override;
-
- void doPreWrite() override;
-
- void doPostWrite() override;
-
+
+ //void doPreRead() override;
+
DataValidity dataValidity() const override;
void interrupt() override;
diff --git a/src/ExceptionHandlingDecorator.cc b/src/ExceptionHandlingDecorator.cc
index 96504ef2..7634b12d 100644
--- a/src/ExceptionHandlingDecorator.cc
+++ b/src/ExceptionHandlingDecorator.cc
@@ -98,25 +98,14 @@ namespace ChimeraTK {
return future;
}
+
+ /*
template<typename UserType>
void ExceptionHandlingDecorator<UserType>::doPreRead() {
genericTransfer([this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPreRead(), true; });
}
-
- template<typename UserType>
- void ExceptionHandlingDecorator<UserType>::doPostRead() {
- genericTransfer([this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPostRead(), true; });
- }
-
- template<typename UserType>
- void ExceptionHandlingDecorator<UserType>::doPreWrite() {
- genericTransfer([this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPreWrite(), true; }, false);
- }
-
- template<typename UserType>
- void ExceptionHandlingDecorator<UserType>::doPostWrite() {
- genericTransfer([this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPostWrite(), true; }, false);
- }
+ */
+
template<typename UserType>
DataValidity ExceptionHandlingDecorator<UserType>::dataValidity() const {
@@ -142,5 +131,12 @@ namespace ChimeraTK {
}
INSTANTIATE_TEMPLATE_FOR_CHIMERATK_USER_TYPES(ExceptionHandlingDecorator);
+
+ /*
+ template<typename UserType>
+ void ExceptionHandlingDecorator<UserType>::doPostRead() {
+ genericTransfer([this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPostRead(), true; });
+ }
+ */
} /* namespace ChimeraTK */
--
GitLab