From 0aa553eb7c0d5a07548fd5256f7c992aa009be5a Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 7 Nov 2011 04:14:09 +0000
Subject: [PATCH] compilation fixes

Originally committed to SVN as r5824.
---
 aegisub/src/ass_exporter.cpp            | 4 ++++
 aegisub/src/audio_display.cpp           | 2 +-
 aegisub/src/auto4_lua_dialog.cpp        | 2 +-
 aegisub/src/command/command.h           | 1 +
 aegisub/src/dialog_kara_timing_copy.cpp | 4 ++--
 aegisub/src/hotkey_data_view_model.cpp  | 1 +
 aegisub/src/visual_tool.cpp             | 4 ++--
 aegisub/src/visual_tool.h               | 1 +
 8 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/aegisub/src/ass_exporter.cpp b/aegisub/src/ass_exporter.cpp
index 4d42a9632..490be6399 100644
--- a/aegisub/src/ass_exporter.cpp
+++ b/aegisub/src/ass_exporter.cpp
@@ -41,6 +41,10 @@
 #include "ass_file.h"
 #include "include/aegisub/context.h"
 
+#ifndef AGI_PRE
+#include <algorithm>
+#endif
+
 static inline std::list<AssExportFilter*>::const_iterator filter_list_begin() {
 	return AssExportFilterChain::GetFilterList()->begin();
 }
diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index 0fb365f5c..8fe41a5db 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -734,7 +734,7 @@ void AudioDisplay::ReloadRenderingSettings()
 		// FFTW is so fast we can afford to upgrade quality by two levels
 		spectrum_quality += 2;
 #endif
-		spectrum_quality = mid(0LL, spectrum_quality, 5LL);
+		spectrum_quality = mid<int64_t>(0, spectrum_quality, 5);
 
 		// Quality indexes:        0  1  2  3   4   5
 		int spectrum_width[]    = {8, 9, 9, 9, 10, 11};
diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp
index a67d47aa7..e30e04d41 100644
--- a/aegisub/src/auto4_lua_dialog.cpp
+++ b/aegisub/src/auto4_lua_dialog.cpp
@@ -88,7 +88,7 @@ namespace {
 	inline void get_if_right_type(lua_State *L, int &def)
 	{
 		if (lua_isnumber(L, -1))
-			def = std::max(lua_tointeger(L, -1), def);
+			def = std::max<int>(lua_tointeger(L, -1), def);
 	}
 
 	inline void get_if_right_type(lua_State *L, bool &def)
diff --git a/aegisub/src/command/command.h b/aegisub/src/command/command.h
index 6a995fe88..b0b903096 100644
--- a/aegisub/src/command/command.h
+++ b/aegisub/src/command/command.h
@@ -22,6 +22,7 @@
 #ifndef AGI_PRE
 #include <map>
 #include <string>
+#include <vector>
 
 #include <wx/bitmap.h>
 #include <wx/string.h>
diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp
index 452045047..8bbe8812d 100644
--- a/aegisub/src/dialog_kara_timing_copy.cpp
+++ b/aegisub/src/dialog_kara_timing_copy.cpp
@@ -397,7 +397,7 @@ void KaraokeLineMatchDisplay::IncreaseSourceMatch()
 
 void KaraokeLineMatchDisplay::DecreaseSourceMatch()
 {
-	source_sel_length = std::max(source_sel_length, 1u) - 1;
+	source_sel_length = std::max<size_t>(source_sel_length, 1) - 1;
 	Refresh(true);
 }
 
@@ -409,7 +409,7 @@ void KaraokeLineMatchDisplay::IncreseDestinationMatch()
 
 void KaraokeLineMatchDisplay::DecreaseDestinationMatch()
 {
-	destination_sel_length = std::max(destination_sel_length, 1u) - 1;
+	destination_sel_length = std::max<size_t>(destination_sel_length, 1) - 1;
 	Refresh(true);
 }
 
diff --git a/aegisub/src/hotkey_data_view_model.cpp b/aegisub/src/hotkey_data_view_model.cpp
index 34cb45f9e..d0e3e6022 100644
--- a/aegisub/src/hotkey_data_view_model.cpp
+++ b/aegisub/src/hotkey_data_view_model.cpp
@@ -38,6 +38,7 @@
 #include <wx/dataview.h>
 #include <wx/regex.h>
 
+#include <list>
 #include <set>
 #endif
 
diff --git a/aegisub/src/visual_tool.cpp b/aegisub/src/visual_tool.cpp
index aa915f3bc..e6968c933 100644
--- a/aegisub/src/visual_tool.cpp
+++ b/aegisub/src/visual_tool.cpp
@@ -441,14 +441,14 @@ Vector2D VisualToolBase::GetLinePosition(AssDialogue *diag) {
 		x = margin[0];
 	else if (hor == 1)
 		x = (script_res.X() + margin[0] - margin[1]) / 2;
-	else if (hor == 2)
+	else
 		x = margin[1];
 
 	if (vert == 0)
 		y = script_res.Y() - margin[2];
 	else if (vert == 1)
 		y = script_res.Y() / 2;
-	else if (vert == 2)
+	else
 		y = margin[2];
 
 	return Vector2D(x, y);
diff --git a/aegisub/src/visual_tool.h b/aegisub/src/visual_tool.h
index 1b305150a..1eadadd13 100644
--- a/aegisub/src/visual_tool.h
+++ b/aegisub/src/visual_tool.h
@@ -24,6 +24,7 @@
 
 #ifndef AGI_PRE
 #include <deque>
+#include <list>
 #include <map>
 #include <set>
 #include <vector>