Merge pull request #99 from arvidn/appveyor-upgrade

appveyor upgrade
This commit is contained in:
Arvid Norberg 2015-08-20 09:33:56 +02:00
commit fa5b8b7140
2 changed files with 71 additions and 63 deletions

View File

@ -2,18 +2,24 @@ version: 1.0.{build}
branches:
only:
- master
os: Windows Server 2012 R2
os: Visual Studio 2015
clone_depth: 1
environment:
matrix:
- variant: test_debug
compiler: msvc
compiler: msvc-12.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
- variant: test_debug
compiler: msvc-10.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
- variant: test_debug
compiler: msvc-14.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
- variant: test_barebones
compiler: msvc
compiler: msvc-12.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
- variant: test_release
compiler: msvc
compiler: msvc-12.0
linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"'
# mingw and boost.random don't like each other. Comment this back in once there
@ -38,7 +44,9 @@ install:
- echo %BOOST_ROOT%
- echo %BOOST_BUILD_PATH%
- set PATH=%PATH%;%BOOST_BUILD_PATH%\src\engine\bin.ntx86
- 'echo using msvc : 12.0 ; >%HOMEDRIVE%%HOMEPATH%\user-config.jam'
- 'echo using msvc : 10.0 ; >%HOMEDRIVE%%HOMEPATH%\user-config.jam'
- 'echo using msvc : 12.0 ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam'
- 'echo using msvc : 14.0 ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam'
- echo using gcc ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam
- type %HOMEDRIVE%%HOMEPATH%\user-config.jam
- cd %ROOT_DIRECTORY%

View File

@ -48,7 +48,7 @@ struct test_plugin : plugin
{
virtual void register_dht_extensions(dht_extensions_t& ext)
{
ext.push_back(std::make_pair("test_good", &good_response));
ext.push_back(dht_extensions_t::value_type("test_good", &good_response));
}
static bool good_response(udp::endpoint const& source