From 118b85fd71a88482fcafe9753622b728c2777278 Mon Sep 17 00:00:00 2001 From: pillowtrucker Date: Fri, 17 May 2024 15:11:27 +0200 Subject: [PATCH] maybe try this again --- cxxsrc/TheracSimulatorAdapter.cpp | 5 +++-- cxxsrc/TheracSimulatorAdapter.hpp | 7 ++++--- hstherac25.cabal | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cxxsrc/TheracSimulatorAdapter.cpp b/cxxsrc/TheracSimulatorAdapter.cpp index 647f694..0683d83 100644 --- a/cxxsrc/TheracSimulatorAdapter.cpp +++ b/cxxsrc/TheracSimulatorAdapter.cpp @@ -7,7 +7,7 @@ // #include // #include // #include -#include +// #include #include namespace TheracSimulatorAdapter { @@ -86,6 +86,7 @@ auto TheracSimulatorAdapter::requestStateInfo( ::requestStateInfo(wrapped_comms, state_info_request) ); } +/* auto TheracSimulatorAdapter::check_malfunction() -> bool { std::shared_lock lock{malfunctioning_mutex}; return malfunctioning; @@ -98,5 +99,5 @@ auto TheracSimulatorAdapter::reset_malfunction() -> bool { std::unique_lock lock{malfunctioning_mutex}; return not(malfunctioning = false); } - +*/ } // namespace TheracSimulatorAdapter diff --git a/cxxsrc/TheracSimulatorAdapter.hpp b/cxxsrc/TheracSimulatorAdapter.hpp index 23552a3..6c4c624 100644 --- a/cxxsrc/TheracSimulatorAdapter.hpp +++ b/cxxsrc/TheracSimulatorAdapter.hpp @@ -4,7 +4,7 @@ // #endif #include // #include -#include +// #include #include namespace TheracSimulatorAdapter { @@ -57,10 +57,11 @@ class TheracSimulatorAdapter { HsInt beam_energy = 0 ); auto requestStateInfo(StateInfoRequest state_info_request) -> std::string; +/* auto check_malfunction() -> bool; auto set_malfunction() -> bool; auto reset_malfunction() -> bool; - +*/ private: static auto hs_init(std::string const & args = "-threaded +RTS -N -RTS") -> HsStablePtr; @@ -68,6 +69,6 @@ class TheracSimulatorAdapter { void * wrapped_comms; bool malfunctioning = false; - std::shared_mutex malfunctioning_mutex; +// std::shared_mutex malfunctioning_mutex; }; } // namespace TheracSimulatorAdapter diff --git a/hstherac25.cabal b/hstherac25.cabal index 1f73cf7..ea04a75 100644 --- a/hstherac25.cabal +++ b/hstherac25.cabal @@ -76,7 +76,7 @@ foreign-library hstherac25 random >= 1.2.1.1, stm other-modules: HsTherac25 --- cxx-sources: cxxsrc/TheracSimulatorAdapter.cpp + cxx-sources: cxxsrc/TheracSimulatorAdapter.cpp -- cxx-sources: cxxsrc/TheracSimulatorAdapter.hpp, cxxsrc/TheracSimulatorAdapter.cpp library -- Import common warning flags.