Skip to content
Snippets Groups Projects
Commit 790df9c9 authored by Christoph Kampmeyer's avatar Christoph Kampmeyer
Browse files

wip: Adapt to TransferElement changes. Removed interrupt overrides.

parent 4d9ac8e5
No related branches found
No related tags found
No related merge requests found
......@@ -64,12 +64,6 @@ namespace ChimeraTK {
std::list<boost::shared_ptr<ChimeraTK::TransferElement>> getInternalElements() override { return {}; }
void interrupt() override {
if(isInterrupted) return;
promise.set_value();
isInterrupted = true;
}
protected:
std::vector<UserType> _value;
......
......@@ -37,8 +37,6 @@ namespace ChimeraTK {
void doPreWrite(TransferType type, VersionNumber versionNumber) override;
void interrupt() override;
void setOwner(EntityOwner* owner);
void doPostRead(TransferType type, bool hasNewData) override;
......
......@@ -55,8 +55,8 @@ namespace ChimeraTK {
template<typename UserType>
class FeedingFanOut : public FanOut<UserType>, public ChimeraTK::NDRegisterAccessor<UserType> {
public:
FeedingFanOut(std::string const& name, std::string const& unit,
std::string const& description, size_t numberOfElements, bool withReturn)
FeedingFanOut(std::string const& name, std::string const& unit, std::string const& description,
size_t numberOfElements, bool withReturn)
: FanOut<UserType>(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>>()),
// We pass default-constructed, empty AccessModeFlags, they may later be determined from _returnSlave
ChimeraTK::NDRegisterAccessor<UserType>("FeedingFanOut:" + name, AccessModeFlags{}, unit, description),
......
......@@ -99,13 +99,6 @@ namespace ChimeraTK {
}
}
template<typename UserType>
void ExceptionHandlingDecorator<UserType>::interrupt() {
// notify the condition variable waiting in reportException of the genericTransfer
deviceModule.notify();
ChimeraTK::NDRegisterAccessorDecorator<UserType>::interrupt();
}
template<typename UserType>
void ExceptionHandlingDecorator<UserType>::setOwner(EntityOwner* owner) {
_owner = owner;
......
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