# 
# 
# patch "ChangeLog"
#  from [29fb4eed07226059ccdd09fbb824bb8048ec6b0a]
#    to [294efa19fef14446c563cbc67145ac545da01339]
# 
# patch "lru_cache.h"
#  from [9a6fce7e00cde0c732236a976744d17ab739ae6c]
#    to [ff73000cd1ddcc0c15a4331854b64ec4fe1af8f8]
# 
============================================================
--- ChangeLog	29fb4eed07226059ccdd09fbb824bb8048ec6b0a
+++ ChangeLog	294efa19fef14446c563cbc67145ac545da01339
@@ -1,3 +1,8 @@
+2006-03-08  Matthew Gregan  <address@hidden>
+
+	* lru_cache.h: Rename some enums to avoid namespace collisions on
+	Win32.
+
 2006-03-08  Joel Rosdahl  <address@hidden>
 
 	* po/sv.po: Minor updates.
============================================================
--- lru_cache.h	9a6fce7e00cde0c732236a976744d17ab739ae6c
+++ lru_cache.h	ff73000cd1ddcc0c15a4331854b64ec4fe1af8f8
@@ -52,8 +52,8 @@
 
 		/// Deletion strategies for element removal.
 		enum deletion_strategies {
-			IGNORE,						///< Simply set erase the element from the cache and allow it leave scope.
-			DELETE,						///< Delete the Data elements before removal from the cache.
+			LRU_IGNORE,						///< Simply set erase the element from the cache and allow it leave scope.
+			LRU_DELETE,						///< Delete the Data elements before removal from the cache.
 		};
 
 	private:
@@ -80,7 +80,7 @@
 		 *  @param Size maximum size of cache
 		 *  @param DeletionStrategy how we dispose of elements when we remove them from the cache
 		 */
-		LRUCache( const unsigned long Size, const deletion_strategies DeletionStrategy = IGNORE ) :
+		LRUCache( const unsigned long Size, const deletion_strategies DeletionStrategy = LRU_IGNORE ) :
 				_max_size( Size ),
 				_deletion_strategy( DeletionStrategy )
 				{}