merge build fix with C++11 from RC_0_16

2013-09-25 19:44:29 +00:00
parent 7ce6425534
commit 89c3db477d
24 changed files with 56 additions and 51 deletions
--- a/test/test_web_seed.cpp
+++ b/test/test_web_seed.cpp
@@ -197,7 +197,7 @@ void save_file(char const* filename, char const* data, int size)
 		fprintf(stderr, "ERROR opening file '%s': %s\n", filename, ec.message().c_str());
 		return;
 	}
-	file::iovec_t b = { (void*)data, size };
+	file::iovec_t b = { (void*)data, size_t(size) };
 	out.writev(0, &b, 1, ec);
 	TEST_CHECK(!ec);
 	if (ec)