Merge branch 'issue81' of github.com:ChimeraTK/ApplicationCore into issue81

include/ExceptionHandlingDecorator.h

@@ -18,15 +18,15 @@ namespace ChimeraTK {
   template<typename UserType>
   class ExceptionHandlingDecorator : public ChimeraTK::NDRegisterAccessorDecorator<UserType> {
    public:
-//    ExceptionHandlingDecorator(
-//        boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> accessor, DeviceModule& devMod,
-//        boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> recoveryAccessor=nullptr);
 
     /// Basic constructor, inititalizes the base decorator and the reference to the DeviceModule
     ExceptionHandlingDecorator(
         boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> accessor, DeviceModule& devMod);
 
-    /// Constructor for writeable registers, allows also setting the recoveryAccessor
+    /**
+     * Constructor for writeable registers, allows also setting the recoveryAccessor.
+     * Deletgates to the basic contructor for member initialization.
+     */
     ExceptionHandlingDecorator(
         boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> accessor, DeviceModule& devMod,
         boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> recoveryAccessor);
@@ -57,6 +57,7 @@ namespace ChimeraTK {
     void interrupt() override;
 
    protected:
+    using ChimeraTK::NDRegisterAccessor<UserType>::buffer_2D;
     DeviceModule& dm;
     DataValidity validity{DataValidity::ok};
     bool genericTransfer(std::function<bool(void)> callable);

src/ExceptionHandlingDecorator.cc

@@ -113,7 +113,7 @@ namespace ChimeraTK {
 
       // Access to _recoveryAccessor is only possible channel-wise
       for(unsigned int ch=0; ch<_recoveryAccessor->getNumberOfChannels(); ++ch){
-       _recoveryAccessor->accessChannel(ch) = NDRegisterAccessorDecorator<UserType>::buffer_2D[ch];
+        _recoveryAccessor->accessChannel(ch) = buffer_2D[ch];
       }
     }
     // Now delegate call to the generic decorator, which swaps the buffer