Merge pull request #447 from micro-manager/fix-build

Fix build after #446
micro-manager · Mar 6, 2024 · e24664f · e24664f
2 parents b50b1d9 + f6c45a6
commit e24664f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DeviceAdapters/DemoCamera/DemoCamera.cpp b/DeviceAdapters/DemoCamera/DemoCamera.cpp
@@ -611,10 +611,10 @@ int CDemoCamera::SnapImage()
       {
 #ifdef _WIN32
          // SleepShort(1);
-#elif
+#else
          CDeviceUtils::SleepMs(1);
 #endif
-      }		
+      }
    }
    else
    {

diff --git a/DeviceAdapters/Utilities/Utilities.h b/DeviceAdapters/Utilities/Utilities.h
@@ -645,7 +645,7 @@ class DAPolygon
       polygon_.push_back(std::make_pair(x, y));
    }
 
-   boolean hasVertex(size_t index) {
+   bool hasVertex(size_t index) {
       return polygon_.size() <= index + 1;
    }
 
@@ -867,4 +867,4 @@ class SerialDTRShutter : public CShutterBase<SerialDTRShutter>
 };
 
 
-#endif //_UTILITIES_H_
+#endif //_UTILITIES_H_
-Original file line number
+Diff line change
@@ Expand Up / @@ -611,10 +611,10 @@ int CDemoCamera::SnapImage() @@
           {
     #ifdef _WIN32
              // SleepShort(1);
-    #elif
+    #else
              CDeviceUtils::SleepMs(1);
     #endif
-          }
+          }
        }
        else
        {
@@ Expand Down @@