From 83d81ed1d73da87fc5577af3a7f3466b3e87659c Mon Sep 17 00:00:00 2001 From: Gordon McCann Date: Thu, 29 Sep 2022 14:23:28 -0400 Subject: [PATCH] Squash some bugs found for compiling with g++ --- src/Core/ThreadSafeQueue.h | 4 ++-- src/Editor/SyncDialog.cpp | 14 ++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/Core/ThreadSafeQueue.h b/src/Core/ThreadSafeQueue.h index 985f8cc..c1911e8 100644 --- a/src/Core/ThreadSafeQueue.h +++ b/src/Core/ThreadSafeQueue.h @@ -31,7 +31,7 @@ namespace Daqromancy { std::scoped_lock guard(m_queueMutex); m_queue.push_front(data); - std::scoped_lock guard(m_conditionMutex); + std::scoped_lock condGuard(m_conditionMutex); m_conditional.notify_one(); } @@ -124,4 +124,4 @@ namespace Daqromancy { }; } -#endif \ No newline at end of file +#endif diff --git a/src/Editor/SyncDialog.cpp b/src/Editor/SyncDialog.cpp index d3768ee..73f7af9 100644 --- a/src/Editor/SyncDialog.cpp +++ b/src/Editor/SyncDialog.cpp @@ -4,16 +4,6 @@ namespace Daqromancy { - static std::string SyncMethodToString(SyncMethod method) - { - switch (method) - { - case SyncMethod::SIn_TrigOut: return "SyncIn-TrigOut"; - case SyncMethod::None: return "None"; - } - return "None"; - } - static std::string StartTypeToString(SyncStartType type) { switch (type) @@ -46,7 +36,7 @@ namespace Daqromancy { { if (ImGui::BeginCombo("Method", SyncMethodToString(m_syncArgs.syncMethod).c_str())) { - if (ImGui::Selectable("SyncIn-TrigOut", SyncMethod::SIn_TrigOut == m_syncArgs.syncMethod, ImGuiSelectableFlags_DontClosePopups)) + if (ImGui::Selectable("S-In TrigOut", SyncMethod::SIn_TrigOut == m_syncArgs.syncMethod, ImGuiSelectableFlags_DontClosePopups)) m_syncArgs.syncMethod = SyncMethod::SIn_TrigOut; if (ImGui::Selectable("None", SyncMethod::None == m_syncArgs.syncMethod, ImGuiSelectableFlags_DontClosePopups)) m_syncArgs.syncMethod = SyncMethod::None; @@ -75,4 +65,4 @@ namespace Daqromancy { return status; } -} \ No newline at end of file +}