* Fixes for compilation on 64-bit architectures :
  string position-returning functions return size_t, not uint.
  Fix that.
* Fixes warnings with new gcc about non-fixed string AND no arguments.

NOTE : 64-bit architectures still do not compile. There are 2 different places
where printf is used with a specifier that is not large enough on 64-bit because
size_t is now a ulong and not a uint. The solution on GNU systems is the %zu
specifier, but as I'm not sure it is supported on windows I don't want to
introduce a huge hard-to-notice bug, so I'll do it at a time when I got a
windowser to back me up.
This commit is contained in:
jean.chalard
2010-01-25 09:58:30 +00:00
parent 9b91fab61b
commit 0a083f4385
13 changed files with 48 additions and 49 deletions
+6 -6
View File
@@ -17,7 +17,7 @@ using std::string;
//MTGAllCards
int MTGAllCards::processConfLine(string s, MTGCard *card, CardPrimitive * primitive){
if (s.size() && s[0] == '#') return 0;
unsigned int i = s.find_first_of("=");
size_t i = s.find_first_of("=");
if (i == string::npos){
#if defined (_DEBUG)
char buffer[4096];
@@ -114,7 +114,7 @@ int MTGAllCards::processConfLine(string s, MTGCard *card, CardPrimitive * primit
case 's': //subtype
if(!primitive) primitive = NEW CardPrimitive();
while (value.size()){
unsigned int found = value.find(" ");
size_t found = value.find(" ");
if (found != string::npos){
primitive->setSubtype(value.substr(0,found));
value = value.substr(found+1);
@@ -136,7 +136,7 @@ int MTGAllCards::processConfLine(string s, MTGCard *card, CardPrimitive * primit
}else if (key.compare("type")==0) {
if(!primitive) primitive = NEW CardPrimitive();
while (value.size()){
unsigned int found = value.find(" ");
size_t found = value.find(" ");
if (found != string::npos){
primitive->setType(value.substr(0,found).c_str());
value = value.substr(found+1);
@@ -514,7 +514,7 @@ int MTGDeck::addRandomCards(int howmany, int * setIds, int nbSets, int rarity, c
char subtype[4096];
if (_subtype)
sprintf(subtype, _subtype);
sprintf(subtype, "%s", _subtype);
vector<int> subcollection;
@@ -832,7 +832,7 @@ string MTGSetInfo::getBlock(){
void MTGSetInfo::processConfLine(string line){
unsigned int i = line.find_first_of("=");
size_t i = line.find_first_of("=");
if (i == string::npos)
return;
@@ -848,4 +848,4 @@ void MTGSetInfo::processConfLine(string line){
block = setlist.findBlock(value.c_str());
else if(key.compare("year") == 0)
year = atoi(value.c_str());
}
}