Index: gdb/gnu-v2-abi.c |
diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c |
index e635e8f1a8a7a3affd4a6bc2c6578835a8471d78..1babe46f1520b25964cf15da0caebdefba0d53a8 100644 |
--- a/gdb/gnu-v2-abi.c |
+++ b/gdb/gnu-v2-abi.c |
@@ -1,7 +1,6 @@ |
/* Abstraction of GNU v2 abi. |
- Copyright (C) 2001-2003, 2005, 2007-2012 Free Software Foundation, |
- Inc. |
+ Copyright (C) 2001-2013 Free Software Foundation, Inc. |
Contributed by Daniel Berlin <dberlin@redhat.com> |
@@ -21,7 +20,7 @@ |
along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
#include "defs.h" |
-#include "gdb_string.h" |
+#include <string.h> |
#include "symtab.h" |
#include "gdbtypes.h" |
#include "value.h" |
@@ -192,7 +191,7 @@ gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc) |
struct type *known_type; |
struct type *rtti_type; |
CORE_ADDR vtbl; |
- struct minimal_symbol *minsym; |
+ struct bound_minimal_symbol minsym; |
char *demangled_name, *p; |
const char *linkage_name; |
struct type *btype; |
@@ -246,8 +245,8 @@ gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc) |
/* Try to find a symbol that is the vtable. */ |
minsym=lookup_minimal_symbol_by_pc(vtbl); |
- if (minsym==NULL |
- || (linkage_name=SYMBOL_LINKAGE_NAME (minsym))==NULL |
+ if (minsym.minsym==NULL |
+ || (linkage_name=SYMBOL_LINKAGE_NAME (minsym.minsym))==NULL |
|| !is_vtable_name (linkage_name)) |
return NULL; |
@@ -424,5 +423,4 @@ _initialize_gnu_v2_abi (void) |
{ |
init_gnuv2_ops (); |
register_cp_abi (&gnu_v2_abi_ops); |
- set_cp_abi_as_auto_default (gnu_v2_abi_ops.shortname); |
} |