From 035dfa2e0426893ff9d7fe4dc7c6c7b38f479494 Mon Sep 17 00:00:00 2001
From: jacksonmj <mj-pt@jacksonmj.co.uk>
Date: Sat, 14 Dec 2013 18:47:28 +0000
Subject: [PATCH] Fix some compiler warnings

---
 src/Format.cpp                | 12 ++++++------
 src/Format.h                  |  8 ++++----
 src/simulation/Simulation.cpp |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Format.cpp b/src/Format.cpp
index 1ece8a4df..8d8551867 100644
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -71,12 +71,12 @@ std::string format::UnixtimeToDateMini(time_t unixtime)
 	}
 }
 
-std::string format::CleanString(std::string dirtyString, int maxStringLength)
+std::string format::CleanString(std::string dirtyString, size_t maxStringLength)
 {
-	return CleanString(dirtyString, (int)std::string::npos, maxStringLength);
+	return CleanString(dirtyString, std::string::npos, maxStringLength);
 }
 
-std::string format::CleanString(std::string dirtyString, int maxVisualSize, int maxStringLength)
+std::string format::CleanString(std::string dirtyString, size_t maxVisualSize, size_t maxStringLength)
 {
 	std::string newString = dirtyString;
 	if(maxStringLength != std::string::npos && newString.size() > maxStringLength)
@@ -95,12 +95,12 @@ std::string format::CleanString(std::string dirtyString, int maxVisualSize, int
 	return newString;
 }
 
-std::string format::CleanString(char * dirtyData, int maxStringLength)
+std::string format::CleanString(char * dirtyData, size_t maxStringLength)
 {
-	return CleanString(dirtyData, (int)std::string::npos, maxStringLength);
+	return CleanString(dirtyData, std::string::npos, maxStringLength);
 }
 
-std::string format::CleanString(char * dirtyData, int maxVisualSize, int maxStringLength)
+std::string format::CleanString(char * dirtyData, size_t maxVisualSize, size_t maxStringLength)
 {
 	char * newData = new char[maxStringLength+1];
 	strncpy(newData, dirtyData, maxStringLength);
diff --git a/src/Format.h b/src/Format.h
index ae200d1aa..4665e2e0b 100644
--- a/src/Format.h
+++ b/src/Format.h
@@ -26,10 +26,10 @@ namespace format
 	std::string URLEncode(std::string value);
 	std::string UnixtimeToDate(time_t unixtime, std::string dateFomat = "%d %b %Y");
 	std::string UnixtimeToDateMini(time_t unixtime);
-	std::string CleanString(std::string dirtyString, int maxVisualSize, int maxStringLength);
-	std::string CleanString(std::string dirtyString, int maxStringLength = std::string::npos);
-	std::string CleanString(char * dirtyData, int maxVisualSize, int maxStringLength);
-	std::string CleanString(char * dirtyData, int maxStringLength);
+	std::string CleanString(std::string dirtyString, size_t maxVisualSize, size_t maxStringLength);
+	std::string CleanString(std::string dirtyString, size_t maxStringLength = std::string::npos);
+	std::string CleanString(char * dirtyData, size_t maxVisualSize, size_t maxStringLength);
+	std::string CleanString(char * dirtyData, size_t maxStringLength);
 	std::vector<char> VideoBufferToPNG(const VideoBuffer & vidBuf);
 	std::vector<char> VideoBufferToBMP(const VideoBuffer & vidBuf);
 	std::vector<char> VideoBufferToPPM(const VideoBuffer & vidBuf);
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index c8e7fbbcc..eed9adf4d 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -304,7 +304,7 @@ void Simulation::Restore(const Snapshot & snap)
 {
 	parts_lastActiveIndex = NPART-1; 
 
-	for(int i = 0; i<NPART; i++)
+	for(int i = 0; i<PT_NUM; i++)
 		elementCount[i] = 0;
 
 	std::copy(snap.AirPressure.begin(), snap.AirPressure.end(), &pv[0][0]);