From 90bff3d1cae762e50fe712c27c80cf410abc1e10 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Tue, 17 Apr 2007 21:18:35 +0000 Subject: [PATCH] Fixed building issues on windows with msvc-8.0 --- Jamfile | 4 +--- include/libtorrent/ip_filter.hpp | 2 +- src/natpmp.cpp | 4 ++-- src/upnp.cpp | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Jamfile b/Jamfile index 87d1b768a..f7cad2624 100755 --- a/Jamfile +++ b/Jamfile @@ -123,8 +123,6 @@ else SOURCES += file ; } -lib openssl_lib : : crypto ; - project torrent : requirements @@ -181,6 +179,6 @@ lib torrent on:src/$(KADEMLIA_SOURCES).cpp logging:src/$(KADEMLIA_SOURCES).cpp off:src/sha1.cpp - on:openssl_lib + on:crypto ; diff --git a/include/libtorrent/ip_filter.hpp b/include/libtorrent/ip_filter.hpp index c75dafd66..1c62c553b 100644 --- a/include/libtorrent/ip_filter.hpp +++ b/include/libtorrent/ip_filter.hpp @@ -75,7 +75,7 @@ namespace detail // a filter for a specific address type. // it works with IPv4 and IPv6 template - class filter_impl + class TORRENT_EXPORT filter_impl { public: diff --git a/src/natpmp.cpp b/src/natpmp.cpp index 3895a6ce9..9db14093c 100644 --- a/src/natpmp.cpp +++ b/src/natpmp.cpp @@ -135,7 +135,7 @@ catch (std::exception& e) m_log << msg.str() << std::endl; #endif m_callback(0, 0, msg.str()); -} +}; void natpmp::set_mappings(int tcp, int udp) { @@ -200,7 +200,7 @@ void natpmp::send_map_request(int i) try catch (std::exception& e) { std::string err = e.what(); -} +}; void natpmp::resend_request(int i, asio::error_code const& e) { diff --git a/src/upnp.cpp b/src/upnp.cpp index daf74bd3f..f87174c12 100644 --- a/src/upnp.cpp +++ b/src/upnp.cpp @@ -144,7 +144,7 @@ catch (std::exception& e) std::stringstream msg; msg << "UPnP portmapping disabled: " << e.what(); m_callback(0, 0, msg.str()); -} +}; void upnp::discover_device() {