Fix typo - make project compilable

src/ExceptionHandlingDecorator.cc

@@ -7,124 +7,131 @@ constexpr useconds_t DeviceOpenTimeout = 500;
 
 namespace ChimeraTK {
 
-  template<typename UserType>
-  bool ExceptionHandlingDecorator<UserType>::genericTransfer(std::function<bool(void)> callable, bool invalidateOnFailure) {
-    std::function<void()> invalidateData{};
-    if (invalidateOnFailure) {
-      invalidateData = [=]() { setDataValidity(DataValidity::faulty); };
-    } else {
-      invalidateData = []() {}; // do nothing if user does
-                                // not want to invalidate data.
-    }
-    while(true) {
-      try {
-        if(!dm.device.isOpened()) {
-	  invalidateData();
-          Application::getInstance().testableModeUnlock("waitForDeviceOpen");
-          boost::this_thread::sleep(boost::posix_time::millisec(DeviceOpenTimeout));
-          Application::getInstance().testableModeLock("waitForDeviceOpen");
-          continue;
+    template<typename UserType>
+    bool ExceptionHandlingDecorator<UserType>::genericTransfer(std::function<bool(void) > callable, bool invalidateOnFailure) {
+        std::function<void() > invalidateData{};
+        if (invalidateOnFailure) {
+            invalidateData = [ = ](){setDataValidity(DataValidity::faulty);};
+        } else {
+            invalidateData = []() {
+            }; // do nothing if user does
+            // not want to invalidate data.
         }
-        auto retval = callable();
-        setDataValidity(DataValidity::ok);
-        return retval;
+        while (true) {
+            try {
+                if (!dm.device.isOpened()) {
+                    invalidateData();
+                    Application::getInstance().testableModeUnlock("waitForDeviceOpen");
+                    boost::this_thread::sleep(boost::posix_time::millisec(DeviceOpenTimeout));
+                    Application::getInstance().testableModeLock("waitForDeviceOpen");
+                    continue;
+                }
+                auto retval = callable();
+                setDataValidity(DataValidity::ok);
+                return retval;
+            } catch (ChimeraTK::runtime_error& e) {
+                invalidateData();
+                dm.reportException(e.what());
+            }
         }
-      } catch (ChimeraTK::runtime_error& e) {
-        invalidateData();
-        dm.reportException(e.what());
-      }
     }
-  }
-
-  template<typename UserType>
-  bool ExceptionHandlingDecorator<UserType>::doWriteTransfer(ChimeraTK::VersionNumber versionNumber) {
-    return genericTransfer([this, versionNumber]() {
-      return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doWriteTransfer(versionNumber);
-    }, false);
-  }
-
-  template<typename UserType>
-  bool ExceptionHandlingDecorator<UserType>::doWriteTransferDestructively(ChimeraTK::VersionNumber versionNumber) {
-    return genericTransfer([this, versionNumber]() {
-      return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doWriteTransferDestructively(versionNumber);
-    }, false);
-  }
-
-  template<typename UserType>
-  void ExceptionHandlingDecorator<UserType>::doReadTransfer() {
-    genericTransfer([this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransfer(), true; });
-  }
-
-  template<typename UserType>
-  bool ExceptionHandlingDecorator<UserType>::doReadTransferNonBlocking() {
-    return genericTransfer(
-        [this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransferNonBlocking(); });
-  }
-
-  template<typename UserType>
-  bool ExceptionHandlingDecorator<UserType>::doReadTransferLatest() {
-    return genericTransfer(
-        [this]() { return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransferLatest(); });
-  }
-
-  template<typename UserType>
-  TransferFuture ExceptionHandlingDecorator<UserType>::doReadTransferAsync() {
-    TransferFuture future;
-    genericTransfer([this, &future]() {
-      future = ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransferAsync();
-      return true;
-    });
-
-    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 {
-    // faulty Validity from the decorated class takes precedence over our own
-    auto delegatedValidity = ChimeraTK::NDRegisterAccessorDecorator<UserType>::dataValidity();
-    if(delegatedValidity == DataValidity::faulty) {
-      return delegatedValidity;
+
+    template<typename UserType>
+    bool ExceptionHandlingDecorator<UserType>::doWriteTransfer(ChimeraTK::VersionNumber versionNumber) {
+        return genericTransfer([this, versionNumber]() {
+            return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doWriteTransfer(versionNumber);
+        }, false);
+    }
+
+    template<typename UserType>
+    bool ExceptionHandlingDecorator<UserType>::doWriteTransferDestructively(ChimeraTK::VersionNumber versionNumber) {
+        return genericTransfer([this, versionNumber]() {
+            return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doWriteTransferDestructively(versionNumber);
+        }, false);
+    }
+
+    template<typename UserType>
+    void ExceptionHandlingDecorator<UserType>::doReadTransfer() {
+        genericTransfer([this]() {
+            return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransfer(), true; });
+    }
+
+    template<typename UserType>
+    bool ExceptionHandlingDecorator<UserType>::doReadTransferNonBlocking() {
+        return genericTransfer(
+                [this]() {
+                    return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransferNonBlocking(); });
+    }
+
+    template<typename UserType>
+    bool ExceptionHandlingDecorator<UserType>::doReadTransferLatest() {
+        return genericTransfer(
+                [this]() {
+                    return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransferLatest(); });
+    }
+
+    template<typename UserType>
+    TransferFuture ExceptionHandlingDecorator<UserType>::doReadTransferAsync() {
+        TransferFuture future;
+        genericTransfer([this, &future]() {
+            future = ChimeraTK::NDRegisterAccessorDecorator<UserType>::doReadTransferAsync();
+            return true;
+        });
+
+        return future;
+    }
+
+    template<typename UserType>
+    void ExceptionHandlingDecorator<UserType>::doPreRead() {
+        genericTransfer([this]() {
+            return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPreRead(), true; });
     }
 
-    return validity;
-  }
+    template<typename UserType>
+    void ExceptionHandlingDecorator<UserType>::doPostRead() {
+        genericTransfer([this]() {
+            return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPostRead(), true; });
+    }
 
-  template<typename UserType>
-  void ExceptionHandlingDecorator<UserType>::setDataValidity(DataValidity newValidity) {
-    // Remember ourselves, but also pass down the line
-    if(newValidity != validity) {
-      validity = newValidity;
-      ChimeraTK::NDRegisterAccessorDecorator<UserType>::setDataValidity(validity);
+    template<typename UserType>
+    void ExceptionHandlingDecorator<UserType>::doPreWrite() {
+        genericTransfer([this]() {
+            return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPreWrite(), true; }, false);
     }
-  }
 
-  template<typename UserType>
-  void ExceptionHandlingDecorator<UserType>::interrupt() {
-    // notify the condition variable waiting in reportException of the genericTransfer
-    dm.notify();
-    ChimeraTK::NDRegisterAccessorDecorator<UserType>::interrupt();
-  }
+    template<typename UserType>
+    void ExceptionHandlingDecorator<UserType>::doPostWrite() {
+        genericTransfer([this]() {
+            return ChimeraTK::NDRegisterAccessorDecorator<UserType>::doPostWrite(), true; }, false);
+    }
+
+    template<typename UserType>
+    DataValidity ExceptionHandlingDecorator<UserType>::dataValidity() const {
+        // faulty Validity from the decorated class takes precedence over our own
+        auto delegatedValidity = ChimeraTK::NDRegisterAccessorDecorator<UserType>::dataValidity();
+        if (delegatedValidity == DataValidity::faulty) {
+            return delegatedValidity;
+        }
+
+        return validity;
+    }
+
+    template<typename UserType>
+    void ExceptionHandlingDecorator<UserType>::setDataValidity(DataValidity newValidity) {
+        // Remember ourselves, but also pass down the line
+        if (newValidity != validity) {
+            validity = newValidity;
+            ChimeraTK::NDRegisterAccessorDecorator<UserType>::setDataValidity(validity);
+        }
+    }
+
+    template<typename UserType>
+    void ExceptionHandlingDecorator<UserType>::interrupt() {
+        // notify the condition variable waiting in reportException of the genericTransfer
+        dm.notify();
+        ChimeraTK::NDRegisterAccessorDecorator<UserType>::interrupt();
+    }
 
-  INSTANTIATE_TEMPLATE_FOR_CHIMERATK_USER_TYPES(ExceptionHandlingDecorator);
+    INSTANTIATE_TEMPLATE_FOR_CHIMERATK_USER_TYPES(ExceptionHandlingDecorator);
 
 } /* namespace ChimeraTK */