From da0fb8cde7d344861c891f1cde67c73bd1ed3e14 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 23 Jul 2010 06:21:22 +0000
Subject: [PATCH] Fix gcc build errors introduced in r4702

Originally committed to SVN as r4704.
---
 aegisub/src/threaded_frame_source.cpp | 4 ++--
 aegisub/src/threaded_frame_source.h   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aegisub/src/threaded_frame_source.cpp b/aegisub/src/threaded_frame_source.cpp
index 9e2dd7661..a21ccf7a6 100644
--- a/aegisub/src/threaded_frame_source.cpp
+++ b/aegisub/src/threaded_frame_source.cpp
@@ -164,7 +164,7 @@ ThreadedFrameSource::ThreadedFrameSource(wxString videoFileName, wxEvtHandler *p
 	Run();
 }
 
-void ThreadedFrameSource::LoadSubtitles(AssFile *subs) {
+void ThreadedFrameSource::LoadSubtitles(AssFile *subs) throw() {
 	AssExporter exporter(subs);
 	exporter.AddAutoFilters();
 	AssFile *exported = exporter.ExportTransform();
@@ -175,7 +175,7 @@ void ThreadedFrameSource::LoadSubtitles(AssFile *subs) {
 	nextSubs.reset(exported);
 }
 
-void ThreadedFrameSource::RequestFrame(int frame, double time) {
+void ThreadedFrameSource::RequestFrame(int frame, double time) throw() {
 	wxMutexLocker locker(jobMutex);
 	nextTime  = time;
 	nextFrame = frame;
diff --git a/aegisub/src/threaded_frame_source.h b/aegisub/src/threaded_frame_source.h
index cf139a5ae..a7b84ffdd 100644
--- a/aegisub/src/threaded_frame_source.h
+++ b/aegisub/src/threaded_frame_source.h
@@ -166,6 +166,6 @@ public:
 	SubtitlesProviderErrorEvent(wxString msg);
 };
 
-wxDECLARE_EVENT(EVT_FRAME_READY, FrameReadyEvent)
-wxDECLARE_EVENT(EVT_VIDEO_ERROR, VideoProviderErrorEvent)
-wxDECLARE_EVENT(EVT_SUBTITLES_ERROR, SubtitlesProviderErrorEvent)
+wxDECLARE_EVENT(EVT_FRAME_READY, FrameReadyEvent);
+wxDECLARE_EVENT(EVT_VIDEO_ERROR, VideoProviderErrorEvent);
+wxDECLARE_EVENT(EVT_SUBTITLES_ERROR, SubtitlesProviderErrorEvent);