Skip to content
Snippets Groups Projects
Commit 8885d55c authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

changed code formatting

parent f2f906bb
No related branches found
No related tags found
No related merge requests found
......@@ -110,7 +110,7 @@ namespace ChimeraTK {
/** Use this function to report an exception. It should be called whenever a
* ChimeraTK::runtime_error has been caught when trying to interact with this
* device. This function shall not be called by the user, all exception
* handling is done internally by ApplicationCore.
* handling is done internally by ApplicationCore.
* This functions is blocking until the Device reports isFunctional() again.*/
void reportException(std::string errMsg);
......@@ -153,7 +153,7 @@ namespace ChimeraTK {
* Initialisation handlers are called after the device has been opended, or after the device is recovering
* from an error (i.e. an accessor has thrown an exception and Device::isFunctional() returns true afterwards).
*
* You can add mupltiple handlers. They are executed in the sequence in which they are registered. If a handler
* You can add mupltiple handlers. They are executed in the sequence in which they are registered. If a handler
* has been registered in the constructor, it is called first.
*
* The handler function is called from the DeviceModule thread (not from the thread with the accessor that threw the exception).
......
......@@ -314,8 +314,8 @@ namespace ChimeraTK {
// Just check the condition variable.
std::unique_lock<std::mutex> errorLock(errorMutex);
while(!deviceHasError) {
boost::this_thread::
interruption_point(); // Make sure not to start waiting for the condition variable if interruption was requested.
boost::this_thread::interruption_point(); // Make sure not to start waiting for the condition variable if
// interruption was requested.
errorIsReportedCondVar.wait(errorLock); // this releases the mutex while waiting
boost::this_thread::interruption_point(); // we need an interruption point in the waiting loop
}
......
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