Merge branch 'master' into merge-2.067

This commit is contained in:
Kai Nacke 2015-05-17 13:06:46 +02:00
commit 1036edc266
5 changed files with 34 additions and 20 deletions

View file

@ -446,7 +446,7 @@ static void remap_outargs(std::string& insnt, size_t nargs, size_t idx)
needle = prefix + digits[i] + suffix;
size_t pos = insnt.find(needle);
if(std::string::npos != pos)
sprintf(buf, "%lu", idx++);
sprintf(buf, "%llu", static_cast<unsigned long long>(idx++));
while(std::string::npos != (pos = insnt.find(needle)))
insnt.replace(pos, needle.size(), buf);
}
@ -471,7 +471,7 @@ static void remap_inargs(std::string& insnt, size_t nargs, size_t idx)
needle = prefix + digits[i] + suffix;
size_t pos = insnt.find(needle);
if(std::string::npos != pos)
sprintf(buf, "%lu", idx++);
sprintf(buf, "%llu", static_cast<unsigned long long>(idx++));
while(std::string::npos != (pos = insnt.find(needle)))
insnt.replace(pos, needle.size(), buf);
}