From c97f91c137b8b7162003d4f03d5648a040f7af9d Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sun, 16 Aug 2009 01:10:20 +0000
Subject: [PATCH] Fix compilation errors on GCC. Also fix a bug in the block
 cache where it wasn't the sorted order of the macroblocks by access count
 that was used in determining which ones to kill off.

Originally committed to SVN as r3415.
---
 aegisub/src/audio_renderer.h |  2 +-
 aegisub/src/block_cache.h    | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/aegisub/src/audio_renderer.h b/aegisub/src/audio_renderer.h
index 283b7132b..e8687c5a1 100644
--- a/aegisub/src/audio_renderer.h
+++ b/aegisub/src/audio_renderer.h
@@ -91,7 +91,7 @@ typedef DataBlockCache<wxBitmap, 8, AudioRendererBitmapCacheBitmapFactory> Audio
 ///
 /// To implement a new audio renderer, see AudioRendererBitmapProvider.
 class AudioRenderer {
-	friend AudioRendererBitmapCacheBitmapFactory;
+	friend struct AudioRendererBitmapCacheBitmapFactory;
 
 	/// Horizontal zoom level, samples per pixel
 	int pixel_samples;
diff --git a/aegisub/src/block_cache.h b/aegisub/src/block_cache.h
index 43a28d2f4..7a638b32d 100644
--- a/aegisub/src/block_cache.h
+++ b/aegisub/src/block_cache.h
@@ -128,11 +128,18 @@ class DataBlockCache {
 	/// Factory object for blocks
 	BlockFactoryT factory;
 
+	/// Used in sorting the macroblocks by access count for aging
+	struct AccessData {
+		MacroBlock *mb;
+		AccessData(MacroBlock *_mb) : mb(_mb) { }
+		// Sort in decreasing order: most accesses first
+		bool operator < (const AccessData &other) { return mb->access_count > other.mb->access_count; }
+	};
+
 	/// @brief Dispose of all blocks in a macroblock and mark it empty
 	/// @param mb_index Index of macroblock to clear
-	void KillMacroBlock(size_t mb_index)
+	void KillMacroBlock(MacroBlock &mb)
 	{
-		MacroBlock &mb = data[mb_index];
 		mb.access_count = 0;
 
 		for (size_t bi = 0; bi < mb.blocks.size(); ++bi)
@@ -203,31 +210,25 @@ public:
 		{
 			for (size_t mbi = 0; mbi < data.size(); ++mbi)
 			{
-				KillMacroBlock(mbi);
+				KillMacroBlock(data[mbi]);
 			}
 			return;
 		}
 
 		// Get a list of macro blocks sorted by access count
-		struct AccessData {
-			MacroBlockArray::iterator mb;
-			AccessData(MacroBlockArray::iterator i) : mb(i) { }
-			// Sort in decreasing order: most accesses first
-			bool operator < (const AccessData &other) { return mb->access_count > other.mb->access_count; }
-		};
 		std::vector<AccessData> access_data;
 		access_data.reserve(data.size());
 		for (MacroBlockArray::iterator mb = data.begin(); mb != data.end(); ++mb)
-			access_data.push_back(AccessData(mb));
+			access_data.push_back(AccessData(&*mb));
 		std::sort(access_data.begin(), access_data.end());
 
 		// Sum up data size until we hit the max
 		size_t cur_size = 0;
 		size_t block_size = factory.GetBlockSize();
 		size_t mbi = 0;
-		for (; mbi < data.size(); ++mbi)
+		for (; mbi < access_data.size(); ++mbi)
 		{
-			BlockArray &ba = data[mbi].blocks;
+			BlockArray &ba = access_data[mbi].mb->blocks;
 			for (size_t i = 0; i < ba.size(); ++i)
 			{
 				if (ba[i] != 0)
@@ -235,7 +236,7 @@ public:
 			}
 			// Cut access count in half for live blocks, so parts that don't get accessed
 			// a lot will eventually be killed off.
-			data[mbi].access_count /= 2;
+			access_data[mbi].mb->access_count /= 2;
 
 			if (cur_size >= max_size)
 			{
@@ -244,9 +245,9 @@ public:
 			}
 		}
 		// Hit max, clear all remaining blocks
-		for (; mbi < data.size(); ++mbi)
+		for (; mbi < access_data.size(); ++mbi)
 		{
-			KillMacroBlock(mbi);
+			KillMacroBlock(*access_data[mbi].mb);
 		}
 	}