X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.fmil.core%2Fnative%2FFMUSimulator%2Fsrc%2Ffmu_control.cpp;h=285be84e42627582224722227a789c39fd9436a5;hb=6e244a5207b971fd651e40182e41517f511e2c2b;hp=310e9066fa7bdb0137ed280ff2c2b5f47a56a6e3;hpb=9dcc8cac323b2fc064007203ef76e57e152699db;p=simantics%2Ffmil.git

diff --git a/org.simantics.fmil.core/native/FMUSimulator/src/fmu_control.cpp b/org.simantics.fmil.core/native/FMUSimulator/src/fmu_control.cpp
index 310e906..285be84 100644
--- a/org.simantics.fmil.core/native/FMUSimulator/src/fmu_control.cpp
+++ b/org.simantics.fmil.core/native/FMUSimulator/src/fmu_control.cpp
@@ -31,9 +31,6 @@ extern "C" {
 
 #define PRINT(fmt,args) { FILE *fp = fopen("R:\\Simantics\\Sysdyn\\log.txt", "ab"); fprintf(fp, fmt, args); fclose(fp); }
 
-#include <direct.h>
-#define GetCurrentDir _getcwd
-
 using namespace std;
 
 struct FMI1 {
@@ -142,7 +139,6 @@ bool exists(string id) {
 JNIEXPORT jint JNICALL Java_org_simantics_fmil_core_FMIL_loadFMUFile_1 
 	(JNIEnv *env, jobject obj, jstring path, jstring tempDir) {
 
-	HMODULE module = NULL;
 	FMI1 fmi1;
 	FMIL_Variable *vars;
 	FMIL_DeclaredType *types;
@@ -455,7 +451,6 @@ JNIEXPORT jdoubleArray JNICALL Java_org_simantics_fmil_core_FMIL_getSubscribedRe
 	jsize n = env -> GetArrayLength(result);
 	int *vrs;
 	const char *error = "";
-	int returnValue = 0;
 
 	FMI1 fmi = fmus[id];
 	if(n > 0) {
@@ -480,7 +475,7 @@ JNIEXPORT jint JNICALL Java_org_simantics_fmil_core_FMIL_instantiateSimulation_1
 	  int returnValue;
 	  const char *error = "";
 
-	  FMI1 fmi = fmus[id];
+	  FMI1 &fmi = fmus[id];
 	  if (fmi.version == 1) {
 		returnValue = FMI1_CS_INSTANTIATE(fmi.fmu, "", &error);
 	  } else if (fmi.version == 2) {
@@ -525,7 +520,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllVariables
 			env->FindClass("java/lang/String"),  
 			env->NewStringUTF(""));  
    
-	for(int i=0;i<fmus[id].variables.size();i++) {  
+	for(unsigned int i=0;i<fmus[id].variables.size();i++) {  
 		env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].variables[i].c_str()));  
 	}  
 
@@ -540,7 +535,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllVariableD
 			env->FindClass("java/lang/String"),  
 			env->NewStringUTF(""));  
    
-	for(int i=0;i<fmus[id].descriptions.size();i++) {  
+	for(unsigned int i=0;i<fmus[id].descriptions.size();i++) {  
 		env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].descriptions[i].c_str()));  
 	}  
 
@@ -555,7 +550,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllVariableD
 			env->FindClass("java/lang/String"),  
 			env->NewStringUTF(""));
    
-	for(int i=0;i<fmus[id].declaredTypes.size();i++) {  
+	for(unsigned int i=0;i<fmus[id].declaredTypes.size();i++) {  
 		env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].declaredTypes[i].c_str()));  
 	}  
 
@@ -610,8 +605,7 @@ JNIEXPORT jintArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllVariableVari
 	jint* resultElements = env -> GetIntArrayElements(result, &isCopy);
 	jsize n = env -> GetArrayLength(result);
 
-	int i;
-	for (i = 0; i < n; i++) {
+	for (jsize i = 0; i < n; i++) {
 		resultElements[i] = fmus[id].variabilities[i];
 	} 
 	  
@@ -630,8 +624,7 @@ JNIEXPORT jintArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllVariableCaus
 	jint* resultElements = env -> GetIntArrayElements(result, &isCopy);
 	jsize n = env -> GetArrayLength(result);
 
-	int i;
-	for (i = 0; i < n; i++) {
+	for (jsize i = 0; i < n; i++) {
 		resultElements[i] = fmus[id].causalities[i];
 	} 
 	  
@@ -650,7 +643,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllDeclaredT
 			env->FindClass("java/lang/String"),  
 			env->NewStringUTF(""));
    
-	for(int i=0;i<fmus[id].declaredTypeNames.size();i++) {  
+	for(unsigned int i=0;i<fmus[id].declaredTypeNames.size();i++) {  
 		env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].declaredTypeNames[i].c_str()));  
 	}  
 
@@ -665,7 +658,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllDeclaredT
 			env->FindClass("java/lang/String"),  
 			env->NewStringUTF(""));
    
-	for(int i=0;i<fmus[id].typeDescriptions.size();i++) {  
+	for(unsigned int i=0;i<fmus[id].typeDescriptions.size();i++) {  
 		env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].typeDescriptions[i].c_str()));  
 	}  
 
@@ -680,7 +673,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllDeclaredT
 			env->FindClass("java/lang/String"),  
 			env->NewStringUTF(""));
    
-	for(int i=0;i<fmus[id].quantities.size();i++) {  
+	for(unsigned int i=0;i<fmus[id].quantities.size();i++) {  
 		env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].quantities[i].c_str()));  
 	}  
 
@@ -695,7 +688,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simantics_fmil_core_FMIL_getAllDeclaredT
 			env->FindClass("java/lang/String"),  
 			env->NewStringUTF(""));
    
-	for(int i=0;i<fmus[id].units.size();i++) {  
+	for(unsigned int i=0;i<fmus[id].units.size();i++) {  
 		env->SetObjectArrayElement(ret,i,env->NewStringUTF(fmus[id].units[i].c_str()));  
 	}  
 
@@ -719,7 +712,7 @@ JNIEXPORT jint JNICALL Java_org_simantics_fmil_core_FMIL_simulateStep_1
 	  int returnValue;
 	  const char *error = "";
 
-	  FMI1 fmi = fmus[id];
+	  FMI1 &fmi = fmus[id];
 	  if (fmi.version == 1) {
 		  returnValue = FMI1_CS_STEP(fmi.fmu, fmi.currentTime, fmi.timeStep, &error);
 	  } else if (fmi.version == 2) {
@@ -981,4 +974,4 @@ JNIEXPORT jstring JNICALL Java_org_simantics_fmil_core_FMIL_getStringValue_1
 	*/
 	  return 0;
 
-}
\ No newline at end of file
+}