updated labrules

magao-x · Nov 2, 2024 · 9b2db04 · 9b2db04
1 parent 65f6b71
commit 9b2db04
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git 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 → gui/rtimv/plugins/acquisition/Makefile b/gui/rtimv/plugins/acquistion/Makefile → gui/rtimv/plugins/acquisition/Makefile
diff --git a/gui/rtimv/plugins/acquistion/acquisition.cpp → ...rtimv/plugins/acquisition/acquisition.cpp b/gui/rtimv/plugins/acquistion/acquisition.cpp → ...rtimv/plugins/acquisition/acquisition.cpp
diff --git a/gui/rtimv/plugins/acquistion/acquisition.hpp → ...rtimv/plugins/acquisition/acquisition.hpp b/gui/rtimv/plugins/acquistion/acquisition.hpp → ...rtimv/plugins/acquisition/acquisition.hpp
diff --git a/gui/rtimv/plugins/acquistion/acquisition.pro → ...rtimv/plugins/acquisition/acquisition.pro b/gui/rtimv/plugins/acquistion/acquisition.pro → ...rtimv/plugins/acquisition/acquisition.pro