projects
/
external
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version number and generated files for 2.33 release.
[external/binutils.git]
/
gdb
/
cp-abi.c
diff --git
a/gdb/cp-abi.c
b/gdb/cp-abi.c
index
f4cf944
..
bbb74d4
100644
(file)
--- a/
gdb/cp-abi.c
+++ b/
gdb/cp-abi.c
@@
-1,6
+1,6
@@
/* Generic code for supporting multiple C++ ABI's
/* Generic code for supporting multiple C++ ABI's
- Copyright (C) 2001-201
7
Free Software Foundation, Inc.
+ Copyright (C) 2001-201
9
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-73,22
+73,21
@@
baseclass_offset (struct type *type, int index, const gdb_byte *valaddr,
gdb_assert (current_cp_abi.baseclass_offset != NULL);
gdb_assert (current_cp_abi.baseclass_offset != NULL);
- TRY
+ try
{
res = (*current_cp_abi.baseclass_offset) (type, index, valaddr,
embedded_offset,
address, val);
}
{
res = (*current_cp_abi.baseclass_offset) (type, index, valaddr,
embedded_offset,
address, val);
}
-
CATCH (ex, RETURN_MASK_ERROR
)
+
catch (const gdb_exception_error &ex
)
{
if (ex.error != NOT_AVAILABLE_ERROR)
{
if (ex.error != NOT_AVAILABLE_ERROR)
- throw
_exception (ex)
;
+ throw;
throw_error (NOT_AVAILABLE_ERROR,
_("Cannot determine virtual baseclass offset "
"of incomplete object"));
}
throw_error (NOT_AVAILABLE_ERROR,
_("Cannot determine virtual baseclass offset "
"of incomplete object"));
}
- END_CATCH
return res;
}
return res;
}
@@
-110,17
+109,17
@@
value_rtti_type (struct value *v, int *full,
{
struct type *ret = NULL;
{
struct type *ret = NULL;
- if ((current_cp_abi.rtti_type) == NULL)
+ if ((current_cp_abi.rtti_type) == NULL
+ || !HAVE_CPLUS_STRUCT (check_typedef (value_type (v))))
return NULL;
return NULL;
- TRY
+ try
{
ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
}
{
ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
}
-
CATCH (e, RETURN_MASK_ERROR
)
+
catch (const gdb_exception_error &e
)
{
return NULL;
}
{
return NULL;
}
- END_CATCH
return ret;
}
return ret;
}
@@
-341,7
+340,7
@@
list_cp_abis (int from_tty)
argument is given. */
static void
argument is given. */
static void
-set_cp_abi_cmd (char *args, int from_tty)
+set_cp_abi_cmd (c
onst c
har *args, int from_tty)
{
if (args == NULL)
{
{
if (args == NULL)
{
@@
-378,7
+377,7
@@
cp_abi_completer (struct cmd_list_element *ignore,
/* Show the currently selected C++ ABI. */
static void
/* Show the currently selected C++ ABI. */
static void
-show_cp_abi_cmd (char *args, int from_tty)
+show_cp_abi_cmd (c
onst c
har *args, int from_tty)
{
struct ui_out *uiout = current_uiout;
{
struct ui_out *uiout = current_uiout;
@@
-390,8
+389,6
@@
show_cp_abi_cmd (char *args, int from_tty)
uiout->text (").\n");
}
uiout->text (").\n");
}
-extern initialize_file_ftype _initialize_cp_abi; /* -Wmissing-prototypes */
-
void
_initialize_cp_abi (void)
{
void
_initialize_cp_abi (void)
{