more missing wchar_t support

This commit is contained in:
Arvid Norberg 2009-04-04 08:32:23 +00:00
parent 3cd26dec64
commit ac7e4fed7e
1 changed files with 10 additions and 11 deletions

View File

@ -33,9 +33,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/pch.hpp" #include "libtorrent/pch.hpp"
#include <ctime> #include <ctime>
#include <iostream>
#include <fstream>
#include <iomanip>
#include <iterator> #include <iterator>
#include <algorithm> #include <algorithm>
#include <set> #include <set>
@ -345,6 +342,7 @@ namespace aux {
return m_asnum_db; return m_asnum_db;
} }
#ifndef BOOST_FILESYSTEM_NARROW_ONLY
bool session_impl::load_asnum_db(wchar_t const* file) bool session_impl::load_asnum_db(wchar_t const* file)
{ {
mutex_t::scoped_lock l(m_mutex); mutex_t::scoped_lock l(m_mutex);
@ -355,14 +353,6 @@ namespace aux {
return m_asnum_db; return m_asnum_db;
} }
bool session_impl::load_country_db(char const* file)
{
mutex_t::scoped_lock l(m_mutex);
if (m_country_db) GeoIP_delete(m_country_db);
m_country_db = GeoIP_open(file, GEOIP_STANDARD);
return m_country_db;
}
bool session_impl::load_country_db(wchar_t const* file) bool session_impl::load_country_db(wchar_t const* file)
{ {
mutex_t::scoped_lock l(m_mutex); mutex_t::scoped_lock l(m_mutex);
@ -372,6 +362,15 @@ namespace aux {
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
bool session_impl::load_country_db(char const* file)
{
mutex_t::scoped_lock l(m_mutex);
if (m_country_db) GeoIP_delete(m_country_db);
m_country_db = GeoIP_open(file, GEOIP_STANDARD);
return m_country_db;
}
#endif #endif