From 9434459821f05c1e2116f993e563488d317b412d Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 30 Jan 2007 22:16:50 +0000 Subject: [PATCH] fix _script_factory name clash, how the heck is this supposed to work at all? Originally committed to SVN as r915. --- aegisub/auto4_auto3.cpp | 2 +- aegisub/auto4_lua.cpp | 2 +- aegisub/auto4_ruby.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aegisub/auto4_auto3.cpp b/aegisub/auto4_auto3.cpp index 411e58e75..e0a4f738c 100644 --- a/aegisub/auto4_auto3.cpp +++ b/aegisub/auto4_auto3.cpp @@ -1452,6 +1452,6 @@ continue_invalid_option: } } }; - Auto3ScriptFactory _script_factory; + Auto3ScriptFactory _auto3_script_factory; }; diff --git a/aegisub/auto4_lua.cpp b/aegisub/auto4_lua.cpp index 5aeda3dd5..8a9900b96 100644 --- a/aegisub/auto4_lua.cpp +++ b/aegisub/auto4_lua.cpp @@ -890,6 +890,6 @@ namespace Automation4 { } } }; - LuaScriptFactory _script_factory; + LuaScriptFactory _lua_script_factory; }; diff --git a/aegisub/auto4_ruby.cpp b/aegisub/auto4_ruby.cpp index 6aa88dba3..d305c68e9 100644 --- a/aegisub/auto4_ruby.cpp +++ b/aegisub/auto4_ruby.cpp @@ -484,7 +484,7 @@ namespace Automation4 { } } }; - RubyScriptFactory _script_factory; + RubyScriptFactory _ruby_script_factory; RubyObjects::RubyObjects() {