Some more refactoring and VHDL transformation

2 files changed, 13 insertions, 13 deletions

diff --git a/src/bindings/swig/csharp/uscxml.i b/src/bindings/swig/csharp/uscxml.i
index 18b8cb8..fbc5f20 100644
--- a/src/bindings/swig/csharp/uscxml.i
+++ b/src/bindings/swig/csharp/uscxml.i
@@ -236,7 +236,7 @@ using System.Runtime.InteropServices;
 		Dictionary<string, NativeIOProcessor> ioProcs = new Dictionary<string, NativeIOProcessor>();
 		StringVector keys = getIOProcessorKeys();
 		IOProcMap ioProcMap = getIOProcessorsNative();
-		for (int i = 0; i < keys.Count; i++) {
+		for (size_t i = 0; i < keys.Count; i++) {
 			ioProcs[keys[i]] = ioProcMap[keys[i]];
 		}
 		return ioProcs;
@@ -246,7 +246,7 @@ using System.Runtime.InteropServices;
 		Dictionary<string, NativeInvoker> invokers = new Dictionary<string, NativeInvoker>();
 		StringVector keys = getInvokerKeys();
 		InvokerMap invokerMap = getInvokersNative();
-		for (int i = 0; i < keys.Count; i++) {
+		for (size_t i = 0; i < keys.Count; i++) {
 			invokers[keys[i]] = invokerMap[keys[i]];
 		}
 		return invokers;
@@ -288,7 +288,7 @@ using System.Runtime.InteropServices;
 		Dictionary<string, Data> compound = new Dictionary<string, Data>();
 		DataMap dataMap = getCompoundNative();
 		StringVector dataMapKeys = getCompoundKeys();
-		for (int i = 0; i < dataMapKeys.Count; i++) {
+		for (size_t i = 0; i < dataMapKeys.Count; i++) {
 			compound[dataMapKeys[i]] = dataMap[dataMapKeys[i]];
 		}
 		return compound;
@@ -305,7 +305,7 @@ using System.Runtime.InteropServices;
 	public List<Data> getArray() {
 		List<Data> arr = new List<Data>();
 		DataList dataList = getArrayNative();
-		for (int i = 0; i < dataList.size(); i++) {
+		for (size_t i = 0; i < dataList.size(); i++) {
 			arr.Add(dataList.get(i));
 		}
 		return arr;
@@ -345,7 +345,7 @@ using System.Runtime.InteropServices;
 		foreach (KeyValuePair<string, DataList> entry in paramMap) {
 			DataList dataList = entry.Value;
 			List<Data> paramList = new List<Data>();
-			for (int i = 0; i < dataList.size(); i++) {
+			for (size_t i = 0; i < dataList.size(); i++) {
 				Data data = dataList.get(i);
 				paramList.Add(data);
 			}
@@ -370,7 +370,7 @@ using System.Runtime.InteropServices;
 		Dictionary<string, Data> nameList = new Dictionary<string, Data>();
 		DataMap nameListMap = getNameListNative();
 		StringVector nameListMapKeys = getNameListKeys();
-		for (int i = 0; i < nameListMapKeys.Count; i++) {
+		for (size_t i = 0; i < nameListMapKeys.Count; i++) {
 			nameList[nameListMapKeys[i]] = nameListMap[nameListMapKeys[i]];
 		}
 		return nameList;
diff --git a/src/bindings/swig/java/uscxml.i b/src/bindings/swig/java/uscxml.i
index 031b9c0..23f6401 100644
--- a/src/bindings/swig/java/uscxml.i
+++ b/src/bindings/swig/java/uscxml.i
@@ -239,7 +239,7 @@ import java.net.URL;
 		Map<String, NativeIOProcessor> ioProcs = new HashMap<String, NativeIOProcessor>();
 		StringVector keys = getIOProcessorKeys();
 		IOProcMap ioProcMap = getIOProcessorsNative();
-		for (int i = 0; i < keys.size(); i++) {
+		for (size_t i = 0; i < keys.size(); i++) {
 			ioProcs.put(keys.get(i), ioProcMap.get(keys.get(i)));
 		}
 		return ioProcs;
@@ -249,7 +249,7 @@ import java.net.URL;
 		Map<String, NativeInvoker> invokers = new HashMap<String, NativeInvoker>();
 		StringVector keys = getInvokerKeys();
 		InvokerMap invokerMap = getInvokersNative();
-		for (int i = 0; i < keys.size(); i++) {
+		for (size_t i = 0; i < keys.size(); i++) {
 			invokers.put(keys.get(i), invokerMap.get(keys.get(i)));
 		}
 		return invokers;
@@ -301,7 +301,7 @@ import java.util.LinkedList;
 		Map<String, Data> compound = new HashMap<String, Data>();
 		DataMap dataMap = getCompoundNative();
 		StringVector dataMapKeys = getCompoundKeys();
-		for (int i = 0; i < dataMapKeys.size(); i++) {
+		for (size_t i = 0; i < dataMapKeys.size(); i++) {
 			compound.put(dataMapKeys.get(i), dataMap.get(dataMapKeys.get(i)));
 		}
 		return compound;
@@ -318,7 +318,7 @@ import java.util.LinkedList;
 	public List<Data> getArray() {
 		List<Data> array = new LinkedList<Data>();
 		DataList dataList = getArrayNative();
-		for (int i = 0; i < dataList.size(); i++) {
+		for (size_t i = 0; i < dataList.size(); i++) {
 			array.add(dataList.get(i));
 		}
 		return array;		
@@ -357,11 +357,11 @@ import java.util.LinkedList;
 		ParamMap paramMap = getParamMap();
 		StringVector paramMapKeys = getParamMapKeys();
 	
-		for (int i = 0; i < paramMapKeys.size(); i++) {
+		for (size_t i = 0; i < paramMapKeys.size(); i++) {
 			String key = paramMapKeys.get(i);
 			DataList dataList = paramMap.get(key);
 		
-			for (int j = 0; j < dataList.size(); j++) {
+			for (size_t j = 0; j < dataList.size(); j++) {
 				Data data = dataList.get(j);
 				if (!params.containsKey(key))
 					params.put(key, new LinkedList<Data>());
@@ -388,7 +388,7 @@ import java.util.LinkedList;
 		StringVector nameMapKeys = getNameListKeys();
 		DataMap nameMap = getNameListNative();
 		
-		for (int i = 0; i < nameMapKeys.size(); i++) {
+		for (size_t i = 0; i < nameMapKeys.size(); i++) {
 			namelist.put(nameMapKeys.get(i), nameMap.get(nameMapKeys.get(i)));
 		}
 		return namelist;