matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some compiler warnings

Browse Source
This commit is contained in:
jacksonmj 2013-12-14 18:47:28 +00:00
parent 30c80220b2
commit 035dfa2e04
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Format.cpp
View File

@ -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);

8
src/Format.h
View File

@ -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);

2
src/simulation/Simulation.cpp
View File

@ -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]);