merge include fix from RC_1_0

This commit is contained in:
arvidn 2015-07-30 20:23:35 -04:00
parent 27499e38ae
commit 3dda8f97d6
1 changed files with 4 additions and 2 deletions

View File

@ -31,13 +31,15 @@ POSSIBILITY OF SUCH DAMAGE.
*/
#include "libtorrent/config.hpp"
#include "libtorrent/utf8.hpp"
#include "libtorrent/ConvertUTF.h"
// on windows we need these functions for
// convert_to_native and convert_from_native
#if TORRENT_USE_WSTRING || defined TORRENT_WINDOWS
#include <iterator>
#include "libtorrent/utf8.hpp"
#include "libtorrent/ConvertUTF.h"
namespace libtorrent
{
namespace