* bfd-in.h (align_power): Cast constants to bfd_vma type.

[deliverable/binutils-gdb.git] / gdb / cp-abi.c

diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index eb31270367e4ca612a06348213bd8c5b789ee061..36d299217bd0bcc1386e8d6442cad005f2429d7f 100644 (file)
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -21,6 +21,7 @@
 #include "defs.h"
 #include "value.h"
 #include "cp-abi.h"
+#include "gdb_string.h"
 
 struct cp_abi_ops current_cp_abi;
 
@@ -60,16 +61,26 @@ is_operator_name (const char *name)
   return (*current_cp_abi.is_operator_name) (name);
 }
 
-value_ptr
-value_virtual_fn_field (value_ptr * arg1p, struct fn_field * f, int j,
+int
+baseclass_offset (struct type *type, int index, char *valaddr,
+                 CORE_ADDR address)
+{
+  if (current_cp_abi.baseclass_offset == NULL)
+    error ("ABI doesn't define required function baseclass_offset");
+  return (*current_cp_abi.baseclass_offset) (type, index, valaddr, address);
+}
+
+struct value *
+value_virtual_fn_field (struct value **arg1p, struct fn_field * f, int j,
                        struct type * type, int offset)
 {
   if ((current_cp_abi.virtual_fn_field) == NULL)
     return NULL;
   return (*current_cp_abi.virtual_fn_field) (arg1p, f, j, type, offset);
 }
+
 struct type *
-value_rtti_type (value_ptr v, int *full, int *top, int *using_enc)
+value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
 {
   if ((current_cp_abi.rtti_type) == NULL)
     return NULL;