don't support older than msvc-14 (2015) (#727)

don't support older than msvc-14 (2015)
This commit is contained in:
Arvid Norberg 2016-05-12 21:24:45 -04:00
parent 674641acce
commit a7213d3f5a
5 changed files with 12 additions and 33 deletions

View File

@ -15,21 +15,15 @@ environment:
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2015\\include"'
- variant: test_debug
compiler: msvc-12.0
model: 64
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
- variant: test_barebones
compiler: msvc-12.0
compiler: msvc-14.0
model: 32
python_package: 1
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"'
include: '"c:\\openssl-1.0.1p-vs2015\\include"'
- variant: test_release
compiler: msvc-12.0
model: 32
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"'
compiler: msvc-14.0
model: 64
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib"'
include: '"c:\\openssl-1.0.1p-vs2015\\include"'
# mingw and boost.random don't like each other. Comment this back in once there
# is support
@ -42,20 +36,6 @@ install:
- if defined sim ( git submodule update --init --recursive )
- set ROOT_DIRECTORY=%CD%
- cd %ROOT_DIRECTORY%
- if %compiler% == msvc-12.0 (
if not exist openssl-1.0.1p-vs2013.7z (
echo downloading openssl-2013
& appveyor DownloadFile "http://www.npcglib.org/~stathis/downloads/openssl-1.0.1p-vs2013.7z"
)
)
- if %compiler% == msvc-12.0 (
echo extracting openssl-2013
& 7z x -oc:\ -aoa openssl-1.0.1p-vs2013.7z > nul
& copy c:\openssl-1.0.1p-vs2013\lib64\ssleay32MT.lib c:\openssl-1.0.1p-vs2013\lib64\ssleay32.lib
& copy c:\openssl-1.0.1p-vs2013\lib64\libeay32MT.lib c:\openssl-1.0.1p-vs2013\lib64\libeay32.lib
& copy c:\openssl-1.0.1p-vs2013\lib\ssleay32MT.lib c:\openssl-1.0.1p-vs2013\lib\ssleay32.lib
& copy c:\openssl-1.0.1p-vs2013\lib\libeay32MT.lib c:\openssl-1.0.1p-vs2013\lib\libeay32.lib
)
- if %compiler% == msvc-14.0 (
if not exist openssl-1.0.1p-vs2015.7z (
echo downloading openssl-2015
@ -89,7 +69,6 @@ install:
- cd %ROOT_DIRECTORY%
cache:
- openssl-1.0.1p-vs2013.7z
- openssl-1.0.1p-vs2015.7z
build_script:

View File

@ -183,7 +183,7 @@ namespace libtorrent
to_process = 0;
for (std::vector<boost::asio::mutable_buffer>::iterator i = iovec.begin();
i != iovec.end(); ++i)
to_process += boost::asio::buffer_size(*i);
to_process += int(boost::asio::buffer_size(*i));
#endif
int next_barrier = 0;
@ -209,7 +209,7 @@ namespace libtorrent
int overhead = 0;
for (std::vector<boost::asio::mutable_buffer>::iterator i = iovec.begin();
i != iovec.end(); ++i)
overhead += boost::asio::buffer_size(*i);
overhead += int(boost::asio::buffer_size(*i));
TORRENT_ASSERT(overhead + to_process == next_barrier);
}
#endif

View File

@ -270,7 +270,7 @@ namespace libtorrent
TORRENT_ASSERT(download_state != piece_pos::piece_open);
TORRENT_ASSERT(find_dl_piece(download_state, i->index) == i);
#if TORRENT_USE_ASSERTS
int prev_size = m_downloads[download_state].size();
int prev_size = int(m_downloads[download_state].size());
#endif
// since we're removing a downloading_piece, we also need to free its

View File

@ -251,7 +251,7 @@ void receive_buffer::mutable_buffers(std::vector<boost::asio::mutable_buffer>& v
int vec_bytes = 0;
for (std::vector<asio::mutable_buffer>::iterator i = vec.begin();
i != vec.end(); ++i)
vec_bytes += boost::asio::buffer_size(*i);
vec_bytes += int(boost::asio::buffer_size(*i));
TORRENT_ASSERT(vec_bytes == bytes);
#endif
}

View File

@ -967,7 +967,7 @@ namespace aux {
while (!m_connections.empty())
{
#if TORRENT_USE_ASSERTS
int conn = m_connections.size();
int conn = int(m_connections.size());
#endif
(*m_connections.begin())->disconnect(errors::stopping_torrent, op_bittorrent);
TORRENT_ASSERT_VAL(conn == int(m_connections.size()) + 1, conn);