From 9b2db04c509510813fbcfb5f964b055cd2b99912 Mon Sep 17 00:00:00 2001 From: Jared Males Date: Sat, 2 Nov 2024 17:01:20 -0300 Subject: [PATCH] updated labrules --- apps/stateRuleEngine/indiCompRules.hpp | 6 ++++-- gui/rtimv/plugins/{acquistion => acquisition}/Makefile | 0 .../plugins/{acquistion => acquisition}/acquisition.cpp | 0 .../plugins/{acquistion => acquisition}/acquisition.hpp | 0 .../plugins/{acquistion => acquisition}/acquisition.pro | 0 5 files changed, 4 insertions(+), 2 deletions(-) rename gui/rtimv/plugins/{acquistion => acquisition}/Makefile (100%) rename gui/rtimv/plugins/{acquistion => acquisition}/acquisition.cpp (100%) rename gui/rtimv/plugins/{acquistion => acquisition}/acquisition.hpp (100%) rename gui/rtimv/plugins/{acquistion => acquisition}/acquisition.pro (100%) diff --git a/apps/stateRuleEngine/indiCompRules.hpp b/apps/stateRuleEngine/indiCompRules.hpp index 11e5b9ea8..d7e7733a9 100644 --- a/apps/stateRuleEngine/indiCompRules.hpp +++ b/apps/stateRuleEngine/indiCompRules.hpp @@ -1014,8 +1014,10 @@ struct ruleCompRule: public indiCompRule /// Default c'tor /** Changes default comparison to And for ruleCompRule */ - ruleCompRule() : m_comparison { ruleComparison::And } - {} + ruleCompRule() + { + comparison(ruleComparison::And); + } /// Set the pointer to the first rule void rule1( indiCompRule * r /**< [in] the new pointer to rule1*/) diff --git a/gui/rtimv/plugins/acquistion/Makefile b/gui/rtimv/plugins/acquisition/Makefile similarity index 100% rename from gui/rtimv/plugins/acquistion/Makefile rename to gui/rtimv/plugins/acquisition/Makefile diff --git a/gui/rtimv/plugins/acquistion/acquisition.cpp b/gui/rtimv/plugins/acquisition/acquisition.cpp similarity index 100% rename from gui/rtimv/plugins/acquistion/acquisition.cpp rename to gui/rtimv/plugins/acquisition/acquisition.cpp diff --git a/gui/rtimv/plugins/acquistion/acquisition.hpp b/gui/rtimv/plugins/acquisition/acquisition.hpp similarity index 100% rename from gui/rtimv/plugins/acquistion/acquisition.hpp rename to gui/rtimv/plugins/acquisition/acquisition.hpp diff --git a/gui/rtimv/plugins/acquistion/acquisition.pro b/gui/rtimv/plugins/acquisition/acquisition.pro similarity index 100% rename from gui/rtimv/plugins/acquistion/acquisition.pro rename to gui/rtimv/plugins/acquisition/acquisition.pro