From 3142317b856f4ff99652fd71d54a4673dd42e596 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 8 Apr 2013 16:30:19 +0000 Subject: [PATCH] merge header fix from libtorrent_aio --- include/libtorrent/peer_info.hpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/libtorrent/peer_info.hpp b/include/libtorrent/peer_info.hpp index c5bd56144..3898df12b 100644 --- a/include/libtorrent/peer_info.hpp +++ b/include/libtorrent/peer_info.hpp @@ -61,11 +61,9 @@ namespace libtorrent snubbed = 0x1000, upload_only = 0x2000, endgame_mode = 0x4000, - holepunched = 0x8000 -#ifndef TORRENT_DISABLE_ENCRYPTION - , rc4_encrypted = 0x100000, + holepunched = 0x8000, + rc4_encrypted = 0x100000, plaintext_encrypted = 0x200000 -#endif }; unsigned int flags; @@ -225,7 +223,7 @@ namespace libtorrent int download_rate_peak; int upload_rate_peak; - // the peers progress + // the peer's progress float progress; // [0, 1] int progress_ppm; // [0, 1000000]