[572371] Prefix all IN and OUT functions with st_

In order to avoid build problems on windows this fix prefixes all IN and OUT port accessor functions with st_. Furthermore all undefs for IN and OUT are removed as well. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=572371 Change-Id: Iaa39aabae43b1a7b00c6410a5e445d7343e2e0e1 Signed-off-by: Alois Zoitl <[email protected]>
eclipse-4diac · Mar 28, 2021 · e44cad5 · e44cad5
1 parent 1cc1f85
commit e44cad5
Show file tree

Hide file tree

Showing 703 changed files with 1,103 additions and 1,197 deletions.
diff --git a/forte_config.h.in b/forte_config.h.in
@@ -13,9 +13,6 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
-#undef IN
-#undef OUT
-
 
 #include <datatype.h>
 

diff --git a/src/com/opc_ua/FBs/LocalizedText2LocalizedText.cpp b/src/com/opc_ua/FBs/LocalizedText2LocalizedText.cpp
@@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_LocalizedText2LocalizedText::scm_stFBInterfaceSpec
 
 void FORTE_LocalizedText2LocalizedText::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID) {
-    OUT() = IN();
+    st_OUT() = st_IN();
     sendOutputEvent(scm_nEventCNFID);
   }
 }

diff --git a/src/com/opc_ua/FBs/LocalizedText2LocalizedText.h b/src/com/opc_ua/FBs/LocalizedText2LocalizedText.h
@@ -22,13 +22,13 @@ class FORTE_LocalizedText2LocalizedText: public CFunctionBlock{
 private:
   static const CStringDictionary::TStringId scm_anDataInputNames[];
   static const CStringDictionary::TStringId scm_anDataInputTypeIds[];
-  CIEC_LocalizedText &IN() {
+  CIEC_LocalizedText &st_IN() {
     return *static_cast<CIEC_LocalizedText*>(getDI(0));
   };
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_LocalizedText &OUT() {
+  CIEC_LocalizedText &st_OUT() {
     return *static_cast<CIEC_LocalizedText*>(getDO(0));
   };
 

diff --git a/src/core/fmi/processinterface.h b/src/core/fmi/processinterface.h
@@ -18,14 +18,6 @@
 #include <string>
 #include <fstream>
 
-#ifdef OUT
-#undef OUT
-#endif
-
-#ifdef IN
-#undef IN
-#endif
-
 class CFMUProcessInterface : public CProcessInterfaceBase{
   public:
     CFMUProcessInterface(CResource *paSrcRes, const SFBInterfaceSpec *paInterfaceSpec, const CStringDictionary::TStringId paInstanceNameId, TForteByte *paFBConnData, TForteByte *paFBVarsData);

diff --git a/src/core/funcbloc.h b/src/core/funcbloc.h
@@ -520,14 +520,6 @@ typedef CFunctionBlock *TFunctionBlockPtr;
  fbBaseClass( pa_poSrcRes, &scm_stFBInterfaceSpec, pa_nInstanceNameId, m_anFBConnData, m_anFBVarsData)
 
 
-#ifdef IN
-#undef IN
-#endif
-
-#ifdef OUT
-#undef OUT
-#endif
-
 #ifdef OPTIONAL
 #undef OPTIONAL
 #endif

diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD.h b/src/modules/IEC61131-3/Arithmetic/F_ADD.h
@@ -31,7 +31,7 @@ class FORTE_F_ADD: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_ANY_MAGNITUDE &OUT() {
+  CIEC_ANY_MAGNITUDE &st_OUT() {
     return *static_cast<CIEC_ANY_MAGNITUDE*>(getDO(0));
   };
 
@@ -59,7 +59,7 @@ class FORTE_F_ADD: public CFunctionBlock{
     T &roIn1(static_cast<T&>(IN1()));
     T oIn2;
     oIn2.saveAssign(IN2());
-    OUT().saveAssign(ADD(roIn1,oIn2));
+    st_OUT().saveAssign(ADD(roIn1,oIn2));
   }
 
   virtual ~FORTE_F_ADD(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.cpp b/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.cpp
@@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_ADD_DT_TIME::scm_stFBInterfaceSpec = {
 
 void FORTE_F_ADD_DT_TIME::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID){
-    OUT() = ADD_DT_TIME(IN1(), IN2());
+    st_OUT() = ADD_DT_TIME(IN1(), IN2());
     sendOutputEvent(scm_nEventCNFID);
   }
 }
diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.h b/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.h
@@ -32,7 +32,7 @@ class FORTE_F_ADD_DT_TIME: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_DATE_AND_TIME &OUT() {
+  CIEC_DATE_AND_TIME &st_OUT() {
     return *static_cast<CIEC_DATE_AND_TIME*>(getDO(0));
   };
 

diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.cpp b/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.cpp
@@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_ADD_TOD_TIME::scm_stFBInterfaceSpec = {
 
 void FORTE_F_ADD_TOD_TIME::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID){
-    OUT() = ADD_TOD_TIME(IN1(), IN2());
+    st_OUT() = ADD_TOD_TIME(IN1(), IN2());
     sendOutputEvent(scm_nEventCNFID);
   }
 }
diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.h b/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.h
@@ -32,7 +32,7 @@ class FORTE_F_ADD_TOD_TIME: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_TIME_OF_DAY &OUT() {
+  CIEC_TIME_OF_DAY &st_OUT() {
     return *static_cast<CIEC_TIME_OF_DAY*>(getDO(0));
   };
 

diff --git a/src/modules/IEC61131-3/Arithmetic/F_DIV.h b/src/modules/IEC61131-3/Arithmetic/F_DIV.h
@@ -31,7 +31,7 @@ class FORTE_F_DIV: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_ANY_NUM &OUT() {
+  CIEC_ANY_NUM &st_OUT() {
     return *static_cast<CIEC_ANY_NUM*>(getDO(0));
   };
 
@@ -61,7 +61,7 @@ class FORTE_F_DIV: public CFunctionBlock{
     oIn1.saveAssign(IN1());
     oIn2.saveAssign(IN2());
 
-    OUT().saveAssign(DIV(oIn1,oIn2));
+    st_OUT().saveAssign(DIV(oIn1,oIn2));
   }
 
   virtual ~FORTE_F_DIV(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_DIVTIME.h b/src/modules/IEC61131-3/Arithmetic/F_DIVTIME.h
@@ -32,7 +32,7 @@ class FORTE_F_DIVTIME: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_TIME &OUT() {
+  CIEC_TIME &st_OUT() {
     return *static_cast<CIEC_TIME*>(getDO(0));
   };
 
@@ -58,7 +58,7 @@ class FORTE_F_DIVTIME: public CFunctionBlock{
 
   template<typename T> void calculateValue(){
     T &roIn2(static_cast<T&>(IN2()));
-    OUT().saveAssign(DIVTIME(IN1(), roIn2));
+    st_OUT().saveAssign(DIVTIME(IN1(), roIn2));
   }
 
   virtual ~FORTE_F_DIVTIME(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_EXPT.h b/src/modules/IEC61131-3/Arithmetic/F_EXPT.h
@@ -32,7 +32,7 @@ class FORTE_F_EXPT: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_ANY_REAL &OUT() {
+  CIEC_ANY_REAL &st_OUT() {
     return *static_cast<CIEC_ANY_REAL*>(getDO(0));
   };
 
@@ -60,7 +60,7 @@ class FORTE_F_EXPT: public CFunctionBlock{
     T &roIn1(static_cast<T&>(IN1()));
     T oIn2;
     oIn2.saveAssign(IN2());
-    OUT().saveAssign(EXPT(roIn1,oIn2));
+    st_OUT().saveAssign(EXPT(roIn1,oIn2));
   }
 
   virtual ~FORTE_F_EXPT(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_MOD.h b/src/modules/IEC61131-3/Arithmetic/F_MOD.h
@@ -32,7 +32,7 @@ class FORTE_F_MOD: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_ANY_NUM &OUT() {
+  CIEC_ANY_NUM &st_OUT() {
     return *static_cast<CIEC_ANY_NUM*>(getDO(0));
   };
 
@@ -60,7 +60,7 @@ class FORTE_F_MOD: public CFunctionBlock{
     T &roIn1(static_cast<T&>(IN1()));
     T oIn2;
     oIn2.saveAssign(IN2());
-    OUT().saveAssign(MOD(roIn1,oIn2));
+    st_OUT().saveAssign(MOD(roIn1,oIn2));
   }
 
   virtual ~FORTE_F_MOD(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_MOVE.cpp b/src/modules/IEC61131-3/Arithmetic/F_MOVE.cpp
@@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_MOVE::scm_stFBInterfaceSpec = {
 
 void FORTE_F_MOVE::executeEvent(int pa_nEIID){
   if (scm_nEventREQID == pa_nEIID) {
-  anyMagnitudeFBHelper<FORTE_F_MOVE>(IN().getDataTypeID(), *this);
+  anyMagnitudeFBHelper<FORTE_F_MOVE>(st_IN().getDataTypeID(), *this);
   sendOutputEvent(scm_nEventCNFID);
   }
 }

diff --git a/src/modules/IEC61131-3/Arithmetic/F_MOVE.h b/src/modules/IEC61131-3/Arithmetic/F_MOVE.h
@@ -22,13 +22,13 @@ class FORTE_F_MOVE: public CFunctionBlock{
 private:
   static const CStringDictionary::TStringId scm_anDataInputNames[];
   static const CStringDictionary::TStringId scm_anDataInputTypeIds[];
-  CIEC_ANY &IN() {
+  CIEC_ANY &st_IN() {
     return *static_cast<CIEC_ANY*>(getDI(0));
   };
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_ANY &OUT() {
+  CIEC_ANY &st_OUT() {
     return *static_cast<CIEC_ANY*>(getDO(0));
   };
 
@@ -53,8 +53,8 @@ class FORTE_F_MOVE: public CFunctionBlock{
   };
 
   template<typename T> void calculateValue(){
-    T &roIn(static_cast<T&>(IN()));
-    OUT().saveAssign(MOVE(roIn));
+    T &roIn(static_cast<T&>(st_IN()));
+    st_OUT().saveAssign(MOVE(roIn));
   }
 
   virtual ~FORTE_F_MOVE(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_MUL.h b/src/modules/IEC61131-3/Arithmetic/F_MUL.h
@@ -31,7 +31,7 @@ class FORTE_F_MUL: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_ANY_NUM &OUT() {
+  CIEC_ANY_NUM &st_OUT() {
     return *static_cast<CIEC_ANY_NUM*>(getDO(0));
   };
 
@@ -59,7 +59,7 @@ class FORTE_F_MUL: public CFunctionBlock{
     T &roIn1(static_cast<T&>(IN1()));
     T oIn2;
     oIn2.saveAssign(IN2());
-    OUT().saveAssign(MUL(roIn1,oIn2));
+    st_OUT().saveAssign(MUL(roIn1,oIn2));
   }
 
   virtual ~FORTE_F_MUL(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_MULTIME.h b/src/modules/IEC61131-3/Arithmetic/F_MULTIME.h
@@ -32,7 +32,7 @@ class FORTE_F_MULTIME: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_TIME &OUT() {
+  CIEC_TIME &st_OUT() {
     return *static_cast<CIEC_TIME*>(getDO(0));
   };
 
@@ -58,7 +58,7 @@ class FORTE_F_MULTIME: public CFunctionBlock{
 
   template<typename T> void calculateValue(){
     T &roIn2(static_cast<T&>(IN2()));
-    OUT().saveAssign(MULTIME(IN1(), roIn2));
+    st_OUT().saveAssign(MULTIME(IN1(), roIn2));
   }
 
   virtual ~FORTE_F_MULTIME(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB.h b/src/modules/IEC61131-3/Arithmetic/F_SUB.h
@@ -31,7 +31,7 @@ class FORTE_F_SUB: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_ANY_MAGNITUDE &OUT() {
+  CIEC_ANY_MAGNITUDE &st_OUT() {
     return *static_cast<CIEC_ANY_MAGNITUDE*>(getDO(0));
   };
 
@@ -59,7 +59,7 @@ class FORTE_F_SUB: public CFunctionBlock{
     T &roIn1(static_cast<T&>(IN1()));
     T oIn2;
     oIn2.saveAssign(IN2());
-    OUT().saveAssign(SUB(roIn1,oIn2));
+    st_OUT().saveAssign(SUB(roIn1,oIn2));
   }
 
   virtual ~FORTE_F_SUB(){};

diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.cpp
@@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_DATE_DATE::scm_stFBInterfaceSpec = {
 
 void FORTE_F_SUB_DATE_DATE::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID){
-    OUT() = SUB_DATE_DATE(IN1(), IN2());
+    st_OUT() = SUB_DATE_DATE(IN1(), IN2());
     sendOutputEvent(scm_nEventCNFID);
   }
 }
diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.h
@@ -32,7 +32,7 @@ class FORTE_F_SUB_DATE_DATE: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_TIME &OUT() {
+  CIEC_TIME &st_OUT() {
     return *static_cast<CIEC_TIME*>(getDO(0));
   };
 

diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.cpp
@@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_DT_DT::scm_stFBInterfaceSpec = {
 
 void FORTE_F_SUB_DT_DT::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID){
-    OUT() = SUB_DT_DT(IN1(), IN2());
+    st_OUT() = SUB_DT_DT(IN1(), IN2());
     sendOutputEvent(scm_nEventCNFID);
   }
 }
diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.h
@@ -32,7 +32,7 @@ class FORTE_F_SUB_DT_DT: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_TIME &OUT() {
+  CIEC_TIME &st_OUT() {
     return *static_cast<CIEC_TIME*>(getDO(0));
   };
 

diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.cpp
@@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_DT_TIME::scm_stFBInterfaceSpec = {
 
 void FORTE_F_SUB_DT_TIME::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID){
-    OUT() = SUB_DT_TIME(IN1(), IN2());
+    st_OUT() = SUB_DT_TIME(IN1(), IN2());
     sendOutputEvent(scm_nEventCNFID);
   }
 }
diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.h
@@ -32,7 +32,7 @@ class FORTE_F_SUB_DT_TIME: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_DATE_AND_TIME &OUT() {
+  CIEC_DATE_AND_TIME &st_OUT() {
     return *static_cast<CIEC_DATE_AND_TIME*>(getDO(0));
   };
 

diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.cpp
@@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_TOD_TIME::scm_stFBInterfaceSpec = {
 
 void FORTE_F_SUB_TOD_TIME::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID){
-    OUT() = SUB_TOD_TIME(IN1(), IN2());
+    st_OUT() = SUB_TOD_TIME(IN1(), IN2());
     sendOutputEvent(scm_nEventCNFID);
   }
 }
diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.h
@@ -32,7 +32,7 @@ class FORTE_F_SUB_TOD_TIME: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_TIME_OF_DAY &OUT() {
+  CIEC_TIME_OF_DAY &st_OUT() {
     return *static_cast<CIEC_TIME_OF_DAY*>(getDO(0));
   };
 

diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.cpp
@@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_TOD_TOD::scm_stFBInterfaceSpec = {
 
 void FORTE_F_SUB_TOD_TOD::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID){
-    OUT() = SUB_TOD_TOD(IN1(), IN2());
+    st_OUT() = SUB_TOD_TOD(IN1(), IN2());
     sendOutputEvent(scm_nEventCNFID);
   }
 }
diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.h
@@ -32,7 +32,7 @@ class FORTE_F_SUB_TOD_TOD: public CFunctionBlock{
 
   static const CStringDictionary::TStringId scm_anDataOutputNames[];
   static const CStringDictionary::TStringId scm_anDataOutputTypeIds[];
-  CIEC_TIME &OUT() {
+  CIEC_TIME &st_OUT() {
     return *static_cast<CIEC_TIME*>(getDO(0));
   };
 

diff --git a/src/modules/IEC61131-3/Arithmetic/F_TRUNC.cpp b/src/modules/IEC61131-3/Arithmetic/F_TRUNC.cpp
@@ -44,12 +44,12 @@ const SFBInterfaceSpec FORTE_F_TRUNC::scm_stFBInterfaceSpec = {
 
 void FORTE_F_TRUNC::executeEvent(int pa_nEIID){
   if(scm_nEventREQID == pa_nEIID){
-    switch(IN().getDataTypeID()){
+    switch(st_IN().getDataTypeID()){
       case CIEC_ANY::e_REAL:
-        OUT().setSignedValue(TRUNC(static_cast<CIEC_REAL &>(IN())));
+        st_OUT().setSignedValue(TRUNC(static_cast<CIEC_REAL &>(st_IN())));
         break;
       default:
-        OUT().setSignedValue(TRUNC(static_cast<CIEC_LREAL &>(IN())));
+        st_OUT().setSignedValue(TRUNC(static_cast<CIEC_LREAL &>(st_IN())));
         break;
     }
     sendOutputEvent(scm_nEventCNFID);