merge build fix with C++11 from RC_0_16

This commit is contained in:
Arvid Norberg
2013-09-25 19:44:29 +00:00
parent 7ce6425534
commit 89c3db477d
24 changed files with 56 additions and 51 deletions

View File

@@ -210,7 +210,7 @@ int main(int argc, char* argv[])
if (first_timestamp == 0) first_timestamp = r.timestamp;
fprintf(expand_file, "%"PRIu64"\t%"PRIu64"\t%"PRIu32"\t%"PRIu32"\t%"PRIu32"\t%"PRIu32"\n"
fprintf(expand_file, "%" PRIu64 "\t%" PRIu64 "\t%" PRIu32 "\t%" PRIu32 "\t%" PRIu32 "\t%" PRIu32 "\n"
, r.timestamp, r.infohash, r.peer, r.piece, r.start, r.length);
bool hit = disk_cache->incoming_request(r);