From de69453826a7a192a2b3f75ecd499d6de761c4f1 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Fri, 16 Mar 2007 07:59:04 +0000
Subject: [PATCH] merged fixes from RC_0_12 branch

---
 docs/manual.html                   | 5 ++---
 docs/manual.rst                    | 5 ++---
 include/libtorrent/alert_types.hpp | 7 ++-----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/docs/manual.html b/docs/manual.html
index e69434a2d..6eea15260 100755
--- a/docs/manual.html
+++ b/docs/manual.html
@@ -2663,7 +2663,7 @@ should be read, and <tt class="docutils literal"><span class="pre">length</span>
 It will only be generated once per torrent. It contains a torrent_handle to the
 torrent in question. This alert is generated as severity level <tt class="docutils literal"><span class="pre">info</span></tt>.</p>
 <pre class="literal-block">
-struct torrent_finished_alert:torrent_ alert
+struct torrent_finished_alert: torrent_alert
 {
         torrent_finished_alert(
                 const torrent_handle&amp; h
@@ -2714,13 +2714,12 @@ struct metadata_received_alert: torrent_alert
 files on disk did not match the fastresume file. The string explains the reason why the
 resume file was rejected. It is generated at severity level <tt class="docutils literal"><span class="pre">warning</span></tt>.</p>
 <pre class="literal-block">
-struct fastresume_rejected_alert: alert
+struct fastresume_rejected_alert: torrent_alert
 {
         fastresume_rejected_alert(torrent_handle const&amp; h
                 , std::string const&amp; msg);
 
         virtual std::auto_ptr&lt;alert&gt; clone() const;
-        torrent_handle handle;
 };
 </pre>
 </div>
diff --git a/docs/manual.rst b/docs/manual.rst
index 01633fca5..bdb262069 100755
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -2742,7 +2742,7 @@ torrent in question. This alert is generated as severity level ``info``.
 
 ::
 
-	struct torrent_finished_alert:torrent_ alert
+	struct torrent_finished_alert: torrent_alert
 	{
 		torrent_finished_alert(
 			const torrent_handle& h
@@ -2802,13 +2802,12 @@ resume file was rejected. It is generated at severity level ``warning``.
 
 ::
 
-	struct fastresume_rejected_alert: alert
+	struct fastresume_rejected_alert: torrent_alert
 	{
 		fastresume_rejected_alert(torrent_handle const& h
 			, std::string const& msg);
 
 		virtual std::auto_ptr<alert> clone() const;
-		torrent_handle handle;
 	};
 
 
diff --git a/include/libtorrent/alert_types.hpp b/include/libtorrent/alert_types.hpp
index c9127c5c4..878185e42 100755
--- a/include/libtorrent/alert_types.hpp
+++ b/include/libtorrent/alert_types.hpp
@@ -249,18 +249,15 @@ namespace libtorrent
 		{ return std::auto_ptr<alert>(new listen_failed_alert(*this)); }
 	};
 
-	struct TORRENT_EXPORT fastresume_rejected_alert: alert
+	struct TORRENT_EXPORT fastresume_rejected_alert: torrent_alert
 	{
 		fastresume_rejected_alert(torrent_handle const& h
 			, std::string const& msg)
-			: alert(alert::warning, msg)
-			, handle(h)
+			: torrent_alert(h, alert::warning, msg)
 		{}
 
 		virtual std::auto_ptr<alert> clone() const
 		{ return std::auto_ptr<alert>(new fastresume_rejected_alert(*this)); }
-
-		torrent_handle handle;
 	};
 
 }