merge changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-11-30 00:30:30 +00:00
parent 99e1a3a829
commit 1e12b50b24
2 changed files with 4 additions and 1 deletions

View File

@ -35,6 +35,9 @@
1.0.3 release 1.0.3 release
* python binding build fix for boost-1.57.0
* add --enable-export-all option to configure script, to export all symbols
from libtorrent
* fix if_nametoindex build error on windows * fix if_nametoindex build error on windows
* handle overlong utf-8 sequences * handle overlong utf-8 sequences
* fix link order bug in makefile for python binding * fix link order bug in makefile for python binding

View File

@ -797,7 +797,7 @@ int test_main()
TEST_CHECK(ret); TEST_CHECK(ret);
std::pair<const char*, int> salt(NULL, 0); std::pair<const char*, int> salt((char*)0, 0);
if (with_salt) if (with_salt)
salt = std::pair<char const*, int>("foobar", 6); salt = std::pair<char const*, int>("foobar", 6);