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

fixed build errors from last check-in

This commit is contained in:
Arvid Norberg 2010-07-14 07:38:35 +00:00
parent 4e576f93fd
commit a3d95677b0
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/aux_/session_impl.hpp
View File

@ -361,8 +361,8 @@ namespace libtorrent
char const* country_for_ip(address const& a); char const* country_for_ip(address const& a);
#if TORRENT_USE_WSTRING #if TORRENT_USE_WSTRING
void load_asnum_db(std::wstring file); void load_asnum_dbw(std::wstring file);
void load_country_db(std::wstring file); void load_country_dbw(std::wstring file);
#endif // TORRENT_USE_WSTRING #endif // TORRENT_USE_WSTRING
#endif // TORRENT_DISABLE_GEO_IP #endif // TORRENT_DISABLE_GEO_IP

4
src/session.cpp
View File

@ -442,12 +442,12 @@ namespace libtorrent
#if TORRENT_USE_WSTRING #if TORRENT_USE_WSTRING
void session::load_asnum_db(wchar_t const* file) void session::load_asnum_db(wchar_t const* file)
{ {
TORRENT_ASYNC_CALL1(load_asnum_db, std::wstring(file)); TORRENT_ASYNC_CALL1(load_asnum_dbw, std::wstring(file));
} }
void session::load_country_db(wchar_t const* file) void session::load_country_db(wchar_t const* file)
{ {
TORRENT_ASYNC_CALL1(load_country_db, std::wstring(file)); TORRENT_ASYNC_CALL1(load_country_dbw, std::wstring(file));
} }
#endif // TORRENT_USE_WSTRING #endif // TORRENT_USE_WSTRING
#endif // TORRENT_DISABLE_GEO_IP #endif // TORRENT_DISABLE_GEO_IP

20
src/session_impl.cpp
View File

@ -932,38 +932,38 @@ namespace aux {
return &(*i); return &(*i);
} }
bool session_impl::load_asnum_db(char const* file) void session_impl::load_asnum_db(std::string file)
{ {
if (m_asnum_db) GeoIP_delete(m_asnum_db); if (m_asnum_db) GeoIP_delete(m_asnum_db);
m_asnum_db = GeoIP_open(file, GEOIP_STANDARD); m_asnum_db = GeoIP_open(file.c_str(), GEOIP_STANDARD);
return m_asnum_db; // return m_asnum_db;
} }
#if TORRENT_USE_WSTRING #if TORRENT_USE_WSTRING
bool session_impl::load_asnum_db(wchar_t const* file) void session_impl::load_asnum_dbw(std::wstring file)
{ {
if (m_asnum_db) GeoIP_delete(m_asnum_db); if (m_asnum_db) GeoIP_delete(m_asnum_db);
std::string utf8; std::string utf8;
wchar_utf8(file, utf8); wchar_utf8(file, utf8);
m_asnum_db = GeoIP_open(utf8.c_str(), GEOIP_STANDARD); m_asnum_db = GeoIP_open(utf8.c_str(), GEOIP_STANDARD);
return m_asnum_db; // return m_asnum_db;
} }
bool session_impl::load_country_db(wchar_t const* file) void session_impl::load_country_dbw(std::wstring file)
{ {
if (m_country_db) GeoIP_delete(m_country_db); if (m_country_db) GeoIP_delete(m_country_db);
std::string utf8; std::string utf8;
wchar_utf8(file, utf8); wchar_utf8(file, utf8);
m_country_db = GeoIP_open(utf8.c_str(), GEOIP_STANDARD); m_country_db = GeoIP_open(utf8.c_str(), GEOIP_STANDARD);
return m_country_db; // return m_country_db;
} }
#endif // TORRENT_USE_WSTRING #endif // TORRENT_USE_WSTRING
bool session_impl::load_country_db(char const* file) void session_impl::load_country_db(std::string file)
{ {
if (m_country_db) GeoIP_delete(m_country_db); if (m_country_db) GeoIP_delete(m_country_db);
m_country_db = GeoIP_open(file, GEOIP_STANDARD); m_country_db = GeoIP_open(file.c_str(), GEOIP_STANDARD);
return m_country_db; // return m_country_db;
} }
#endif // TORRENT_DISABLE_GEO_IP #endif // TORRENT_DISABLE_GEO_IP