Rewrite TRY/CATCH

[deliverable/binutils-gdb.git] / gdb / guile / scm-cmd.c

diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c
index 1266a7909470771cacbaf7bccf7c11c1ce3c7343..a89650b2627f7b7f7c5684e2129f77da71b0ecb9 100644 (file)
--- a/gdb/guile/scm-cmd.c
+++ b/gdb/guile/scm-cmd.c
@@ -758,7 +758,7 @@ gdbscm_register_command_x (SCM self)
   c_smob->cmd_name = gdbscm_gc_xstrdup (cmd_name);
   xfree (cmd_name);
 
-  TRY
+  try
     {
       if (c_smob->is_prefix)
        {
@@ -776,11 +776,10 @@ gdbscm_register_command_x (SCM self)
                         c_smob->doc, cmd_list);
        }
     }
-  CATCH (except, RETURN_MASK_ALL)
+  catch (const gdb_exception_RETURN_MASK_ALL &except)
     {
       GDBSCM_HANDLE_GDB_EXCEPTION (except);
     }
-  END_CATCH
 
   /* Note: At this point the command exists in gdb.
      So no more errors after this point.  */