mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-13 11:54:00 +02:00
Code Issues Projects Releases Wiki Activity

- attempt to switch CRC to use unsigned int everywhere

Browse Source
This commit is contained in:
Mark Vejvoda
2012-07-07 02:46:57 +00:00
parent bf0e76c5e7
commit 4202989014
24 changed files with 327 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/shared_lib/include/util/checksum.h
View File

@@ -29,28 +29,30 @@ namespace Shared{ namespace Util{
class Checksum {
private:
int32 sum;
uint32 sum;
int32 r;
int32 c1;
int32 c2;
std::map<string,int32> fileList;
std::map<string,uint32> fileList;
static Mutex fileListCacheSynchAccessor;
static std::map<string,int32> fileListCache;
static std::map<string,uint32> fileListCache;
void addSum(int32 value);
void addSum(uint32 value);
bool addFileToSum(const string &path);
public:
Checksum();
int32 getSum();
int32 getFinalFileListSum();
int32 getFileCount();
uint32 getSum();
uint32 getFinalFileListSum();
uint32 getFileCount();
int32 addByte(int8 value);
//uint32 addByte(int8 value);
uint32 addByte(const char value);
uint32 addBytes(const void *_data, size_t _size);
void addString(const string &value);
int32 addInt(const int32 &value);
uint32 addInt(const int32 &value);
void addFile(const string &path);
static void removeFileFromCache(const string file);

3
source/shared_lib/include/util/conversion.h
View File

@@ -24,13 +24,16 @@ namespace Shared { namespace Util {
bool strToBool(const string &s);
int strToInt(const string &s);
uint32 strToUInt(const string &s);
float strToFloat(const string &s);
bool strToBool(const string &s, bool *b);
bool strToInt(const string &s, int *i);
bool strToUInt(const string &s, uint32 *i);
bool strToFloat(const string &s, float *f);
string boolToStr(bool b);
string uIntToStr(uint32 i);
string intToStr(int64 i);
string intToHex(int i);
string floatToStr(float f,int precsion=2);