From f6c45a68b6ed29b59965613b19ab34966b6fcc64 Mon Sep 17 00:00:00 2001 From: "Mark A. Tsuchida" Date: Tue, 5 Mar 2024 17:52:35 -0600 Subject: [PATCH] Fix build after #446 Did not compile on either Windows or macOS without this. --- DeviceAdapters/DemoCamera/DemoCamera.cpp | 4 ++-- DeviceAdapters/Utilities/Utilities.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DeviceAdapters/DemoCamera/DemoCamera.cpp b/DeviceAdapters/DemoCamera/DemoCamera.cpp index 3558767c8..008a4f505 100644 --- 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 index a16b6e163..9b7864728 100644 --- 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 }; -#endif //_UTILITIES_H_ \ No newline at end of file +#endif //_UTILITIES_H_