From 546f31c29fe7a02e49563942e2de25bcde87edef Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Mon, 23 Mar 2020 17:42:24 -0500 Subject: [PATCH] Change and to && to compiler on Windows --- andorApp/src/andorCCD.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/andorApp/src/andorCCD.cpp b/andorApp/src/andorCCD.cpp index cc9344d..a9345e5 100755 --- a/andorApp/src/andorCCD.cpp +++ b/andorApp/src/andorCCD.cpp @@ -394,7 +394,7 @@ AndorCCD::~AndorCCD() status = asynError; } this->unlock(); - while (mExited < 2 and status != asynError) + while ((mExited < 2) && (status != asynError)) epicsThreadSleep(0.2); }