1.10.3 release
Change-Id: I3080077de8acc81a059c41c177127ef238090d65
diff --git a/src/arch/macos/CMakeLists.txt b/src/arch/macos/CMakeLists.txt
index fc59009..232ee21 100644
--- a/src/arch/macos/CMakeLists.txt
+++ b/src/arch/macos/CMakeLists.txt
@@ -17,6 +17,9 @@
forte_add_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ # on MacOs linked string dict is currently not working, turn it off per default
+ SET(FORTE_LINKED_STRINGDICT OFF CACHE BOOL "" FORCE)
+
forte_set_timer(../posix/pctimeha)
forte_add_sourcefile_hcpp(../posix/forte_thread forte_sync forte_sem)
forte_add_sourcefile_cpp(../genforte_printer.cpp)
diff --git a/src/arch/win32/forte_sem.h b/src/arch/win32/forte_sem.h
index a6af35b..2acf5de 100644
--- a/src/arch/win32/forte_sem.h
+++ b/src/arch/win32/forte_sem.h
@@ -64,4 +64,4 @@
} /* namespace arch */
} /* namespace forte */
-#endif /* SRC_ARCH_POSIX_SEMAPHORE_H_ */
+#endif /* SRC_ARCH_WIN32_SEMAPHORE_H_ */
diff --git a/src/core/resource.cpp b/src/core/resource.cpp
index 81d6768..0b5d3e3 100644
--- a/src/core/resource.cpp
+++ b/src/core/resource.cpp
@@ -402,6 +402,7 @@
retVal = e_INVALID_OPERATION;
}
}
+ paLuaScriptAsString.clear();
return retVal;
}
@@ -413,6 +414,7 @@
}else{
retVal = e_INVALID_OPERATION;
}
+ paLuaScriptAsString.clear();
return retVal;
}
#endif //FORTE_DYNAMIC_TYPE_LOAD
diff --git a/src/stdfblib/events/E_CTD.cpp b/src/stdfblib/events/E_CTD.cpp
index 3fc8fa0..eb3512b 100644
--- a/src/stdfblib/events/E_CTD.cpp
+++ b/src/stdfblib/events/E_CTD.cpp
@@ -1,5 +1,6 @@
/*******************************************************************************
* Copyright (c) 2014 ACIN
+ * 2019 Johannes Kepler University Linz
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +8,7 @@
*
* Contributors:
* Monika Wenger - initial API and implementation and/or initial documentation
+ * Alois Zoitl - fixed bug in down counting
*******************************************************************************/
#include "E_CTD.h"
#ifdef FORTE_ENABLE_GENERATED_SOURCE_CPP
@@ -37,18 +39,15 @@
2, scm_anDataOutputNames, scm_anDataOutputTypeIds,
0, 0
};
-
-void FORTE_E_CTD::alg_CD(void){
-CV() = static_cast<TForteUInt16>(CV() - 1);
-Q() = ((CV() <= 0));
-
+void FORTE_E_CTD::alg_CD(void){
+CV() = static_cast<TForteUInt16>(CV()-1);
+Q() = ((CV() == 0));
}
void FORTE_E_CTD::alg_LD(void){
CV() = PV();
-Q() = ((CV() <= 0));
-
+Q() = ((CV() == 0));
}
@@ -74,7 +73,7 @@
bTransitionCleared = true;
switch(m_nECCState){
case scm_nStateSTART:
- if((scm_nEventCDID == pa_nEIID) && (((CV() >= 1))))
+ if((scm_nEventCDID == pa_nEIID) && (((CV() > 0))))
enterStateCU();
else
if(scm_nEventLDID == pa_nEIID)
diff --git a/src/stdfblib/events/E_CTUD.cpp b/src/stdfblib/events/E_CTUD.cpp
index d0ff86b..e41f63d 100644
--- a/src/stdfblib/events/E_CTUD.cpp
+++ b/src/stdfblib/events/E_CTUD.cpp
@@ -1,5 +1,6 @@
/*******************************************************************************
* Copyright (c) 2013 fortiss GmbH
+ * 2019 Johannes Kepler University Linz
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +8,7 @@
*
* Contributors:
* Alois Zoitl - initial API and implementation and/or initial documentation
+ * Alois Zoitl - fixed bug in down counting
*******************************************************************************/
#include "E_CTUD.h"
#ifdef FORTE_ENABLE_GENERATED_SOURCE_CPP
@@ -55,7 +57,7 @@
void FORTE_E_CTUD::alg_UpdateQUQD(void){
QU() = ((CV() >= PV()));
-QD() = ((CV() <= 0));
+QD() = ((CV() == 0));
}
void FORTE_E_CTUD::alg_CountDown(void){
@@ -107,7 +109,7 @@
if(scm_nEventRID == pa_nEIID)
enterStateR();
else
- if((scm_nEventCDID == pa_nEIID) && (((CV() >= 1))))
+ if((scm_nEventCDID == pa_nEIID) && (((((CV() > 0))))))
enterStateCD();
else
if(scm_nEventLDID == pa_nEIID)
