wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

merged fix from RC_0_16

This commit is contained in:
Arvid Norberg 2012-06-03 05:13:08 +00:00
parent 49a1398fe5
commit b022772b4d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jamfile
View File

@ -575,7 +575,7 @@ local usage-requirements =
# make sure asio symbols are properly exported
# and imported
<link>shared:<define>BOOST_ASIO_DYN_LINK
<link>static:<define>BOOST_ASIO_SEPARATE_COMPILATION
<define>BOOST_ASIO_SEPARATE_COMPILATION
<tag>@tag
;
@ -596,6 +596,8 @@ lib torrent
# to declare the symbol as being exported
<link>shared,<boost-link>static:<define>BOOST_ASIO_SOURCE
<link>shared,<boost-link>static:<define>BOOST_SYSTEM_SOURCE
<link>shared,<boost-link>static:<define>BOOST_ALL_DYN_LINK
<link>shared:<define>BOOST_ALL_DYN_LINK
<dht-support>on:<source>src/kademlia/$(KADEMLIA_SOURCES).cpp
<dht-support>logging:<source>src/kademlia/$(KADEMLIA_SOURCES).cpp
@ -610,6 +612,7 @@ lib torrent
: # usage requirements
$(usage-requirements)
<link>shared:<define>TORRENT_LINKING_SHARED
;
headers = [ path.glob-tree include/libtorrent : *.hpp ] ;

8
include/libtorrent/escape_string.hpp
View File

@ -80,10 +80,10 @@ namespace libtorrent
TORRENT_EXTRA_EXPORT void convert_path_to_posix(std::string& path);
TORRENT_EXTRA_EXPORT std::string read_until(char const*& str, char delim, char const* end);
TORRENT_EXTRA_EXPORT std::string to_hex(std::string const& s);
TORRENT_EXTRA_EXPORT bool is_hex(char const *in, int len);
TORRENT_EXTRA_EXPORT void to_hex(char const *in, int len, char* out);
TORRENT_EXTRA_EXPORT bool from_hex(char const *in, int len, char* out);
TORRENT_EXPORT std::string to_hex(std::string const& s);
TORRENT_EXPORT bool is_hex(char const *in, int len);
TORRENT_EXPORT void to_hex(char const *in, int len, char* out);
TORRENT_EXPORT bool from_hex(char const *in, int len, char* out);
#if defined TORRENT_WINDOWS && TORRENT_USE_WSTRING
TORRENT_EXTRA_EXPORT std::wstring convert_to_wstring(std::string const& s);