[project @ 2005-07-04 01:48:38 by unknown_lamer]

[clinton/bobotpp.git] / source / BotInterp.C

diff --git a/source/BotInterp.C b/source/BotInterp.C
index 01ba996..e020cfd 100644 (file)
--- a/source/BotInterp.C
+++ b/source/BotInterp.C
@@ -1,6 +1,6 @@
 // BotInterp.C  -*- C++ -*-
 // Copyright (c) 1998 Etienne BERNARD
-// Copyright (C) 2002 Clinton Ebadi
+// Copyright (C) 2002,2005 Clinton Ebadi
 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,7 +14,8 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -115,9 +116,10 @@ BotInterp::RunHooks(int hooktype, String match, SCM args)
       {
        wd.func = (*it)->function;
        result = scm_internal_catch(SCM_BOOL_T, 
-                                   (scm_t_catch_body) lazy_apply_wrapper,
+                                   (scm_t_catch_body) 
+                                   Interp::LazyApplyWrapper,
                                    static_cast<void *> (&wd), 
-                                   (scm_t_catch_handler) empty_handler, 0);
+                                   (scm_t_catch_handler) Interp::EmptyHandler, 0);
        if (! (*it)->fallthru)
          break;
     }
@@ -168,8 +170,8 @@ BotInterp::RunTimers(int now)
     if ((*it)->when <= now) {
       wd.func = (*it)->function;
       scm_internal_catch(SCM_BOOL_T,
-                    (scm_t_catch_body) lazy_apply_wrapper, (void *)&wd,
-                    (scm_t_catch_handler) empty_handler, 0);
+                    (scm_t_catch_body) Interp::LazyApplyWrapper, (void *)&wd,
+                    (scm_t_catch_handler) Interp::EmptyHandler, 0);
       scm_gc_unprotect_object(wd.func);
       it3 = it;
       ++it3;